May 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68073 - /tags/branch-Code-11-SP1-2_17_17_2/
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:09:33 2012 New Revision: 68073 URL: http://svn.opensuse.org/viewcvs/yast?rev=68073&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_2 Added: tags/branch-Code-11-SP1-2_17_17_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] r68072 - /tags/branch-Code-11-SP1-2_17_18_2/ncurses/
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:07:52 2012 New Revision: 68072 URL: http://svn.opensuse.org/viewcvs/yast?rev=68072&view=rev Log: Created tag branch-Code-11-SP1-2_17_18_2 for ncurses Added: tags/branch-Code-11-SP1-2_17_18_2/ncurses/ (props changed) - copied from r68071, branches/SuSE-Code-11-SP1-Branch/ncurses/ -- 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] r68071 - /tags/branch-Code-11-SP1-2_17_18_2/
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:07:50 2012 New Revision: 68071 URL: http://svn.opensuse.org/viewcvs/yast?rev=68071&view=rev Log: Created tag branch-Code-11-SP1-2_17_18_2 Added: tags/branch-Code-11-SP1-2_17_18_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] r68070 - in /branches/SuSE-Code-11-SP1-Branch/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:07:36 2012 New Revision: 68070 URL: http://svn.opensuse.org/viewcvs/yast?rev=68070&view=rev Log: 2.17.18.2 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION Thu May 3 13:07:36 2012 @@ -1 +1 @@ -2.17.18.1 +2.17.18.2 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes Thu May 3 13:07:36 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu May 3 13:06:24 CEST 2012 - gs(a)suse.de + +- NCRichText: interpret html tags inside <pre> (bnc #724119), + don't display html tags in license (bnc #605113, bnc #737752) or + in runlevel editor info popup (bnc #758230) +- V 2.17.18.2 + +------------------------------------------------------------------- Wed Mar 9 11:51:53 CET 2011 - gs(a)suse.de - Show block devices in file selection dialog (bnc #661685) -- 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] r68069 - in /branches/SuSE-Code-11-SP1-Branch/ncurses/src: NCRichText.cc NCRichText.h
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:06:15 2012 New Revision: 68069 URL: http://svn.opensuse.org/viewcvs/yast?rev=68069&view=rev Log: bug-fix for <pre> tag, bnc #724119, bnc #605113, bnc #737752, bnc #758230 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.cc branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.h Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.cc Thu May 3 13:06:15 2012 @@ -160,6 +160,11 @@ , NCPadWidget( parent ) , text( ntext ) , plainText( plainTextMode ) + , textwidth( 0 ) + , cl( 0 ) + , cc( 0 ) + , cindent( 0 ) + , atbol( true ) , preTag( false ) , Tattr( 0 ) { @@ -317,36 +322,23 @@ } } - -void NCRichText::PadPlainTXT( const wchar_t * osch, const unsigned olen ) +void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); - + NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - if ( ftext.Columns() > textwidth ) - textwidth = ftext.Columns(); - - AdjustPad( wsze( cl + ftext.Lines(), textwidth ) ); - // insert the text const wchar_t * sch = wtxt.data(); while ( *sch ) { - if ( *sch != L'\r' ) // skip carriage return - { - myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + myPad()->addwstr( sch, 1 ); // add one wide chararacter - if ( *sch == L'\n' ) - { - PadNL(); // add a new line - } - } ++sch; } } @@ -368,7 +360,7 @@ } -static wstring WStoken( L" \n\t\v\r" ); +static wstring WStoken( L" \n\t\v\r\f" ); inline void SkipWS( const wchar_t *& wch ) @@ -381,7 +373,7 @@ } -static wstring WDtoken( L" <\n\t\v\r" ); // WS + TokenStart '<' +static wstring WDtoken( L" <\n\t\v\r\f" ); // WS + TokenStart '<' inline void SkipWord( const wchar_t *& wch ) @@ -393,21 +385,92 @@ while ( *wch && WDtoken.find( *wch ) == wstring::npos ); } +static wstring PREtoken( L"<\n\v\r\f" ); // line manipulations + TokenStart '<' + inline void SkipPreTXT( const wchar_t *& wch ) { + do + { + ++wch; + } + while ( *wch && PREtoken.find( *wch ) == wstring::npos ); +} + + +void NCRichText::AdjustPrePad( const wchar_t *osch ) +{ + const wchar_t * wch = osch; wstring wstr( wch, 6 ); + size_t llen = 0; // longest line + size_t tmp_len = 0; // width of current line + + list<NCstring>::const_iterator line; // iterator for list <NCstring> mtext + std::wstring::const_iterator wstr_it; // iterator for wstring + do { - ++wch; + ++wch; wstr.assign( wch, 6 ); } while ( *wch && wstr != L"</pre>" ); -} + wstring wtxt( osch, wch - osch ); + + // resolve the entities to get correct length for calculation of longest line + wtxt = filterEntities( wtxt ); + + wstring to_repl = L" "; + size_t pos; + // replace by \n to get appropriate lines in NCtext + for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) + wtxt.replace( pos, to_repl.length(), L"\n" ); + // handle DOS text + for ( ; (pos = wtxt.find( L"\r" )) != wstring::npos ; ) + wtxt.replace( pos, 1, L"" ); + for ( ; (pos = wtxt.find( L"\f" )) != wstring::npos ; ) + wtxt.replace( pos, 1, L"\n" ); + + yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + + NCstring nctxt( wtxt ); + NCtext ftext( nctxt ); + + // iterate through NCtext + for ( line = ftext.Text().begin(); line != ftext.Text().end(); ++line ) + { + tmp_len = 0; + + for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) + { + // skip html tags + if ( *wstr_it == '<' ) + { + wstr_it = find(wstr_it, (*line).str().end(), L'>'); + } + else if ( *wstr_it == '\t' ) + { + tmp_len += myPad()->tabsize(); + } + else + { + tmp_len += wcwidth( *wstr_it ); + } + } + + if ( tmp_len > llen ) + llen = tmp_len; + } + if ( llen > textwidth ) + { + textwidth = llen; + AdjustPad( wsze( cl + ftext.Lines(), llen ) ); // adjust pad to longest line + } + +} void NCRichText::DrawHTMLPad() { @@ -436,6 +499,7 @@ case L'\n': case L'\v': case L'\r': + case L'\f': if ( ! preTag ) { SkipWS( wch ); @@ -443,10 +507,20 @@ } else { - if ( *wch != L'\r' ) // skip carriage return + switch ( *wch ) { - myPad()->addwstr( wch, 1 ); // add the wide chararacter - cc += wcwidth( *wch ); + case L' ': // add white space + case L'\t': + myPad()->addwstr( wch, 1 ); + break; + + case L'\n': + case L'\f': + PadNL(); // add new line + break; + + default: + yuiDebug() << "Ignoring " << *wch << endl; } ++wch; } @@ -455,8 +529,8 @@ case L'<': swch = wch; - SkipToken( wch ); - + SkipToken( wch ); + if ( PadTOKEN( swch, wch ) ) break; // strip token else @@ -473,7 +547,7 @@ else { SkipPreTXT( wch ); - PadPlainTXT( swch, wch - swch ); + PadPreTXT( swch, wch - swch ); } break; @@ -482,6 +556,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); + yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -563,7 +638,9 @@ } /** - * Get the number of columns needed to print a 'wstring'. + * Get the number of columns needed to print a 'wstring'. Only printable characters + * are taken into account because otherwise 'wcwidth' would return -1 (e.g. for '\n'). + * Tabs are calculated with tabsize(). * Attention: only use textWidth() to calculate space, not for iterating through a text * or to get the length of a text (real text length includes new lines). */ @@ -574,7 +651,15 @@ for ( wstr_it = wstr.begin(); wstr_it != wstr.end() ; ++wstr_it ) { - len += wcwidth( *wstr_it ); + // check whether char is printable + if ( iswprint( *wstr_it ) ) + { + len += wcwidth( *wstr_it ); + } + else if ( *wstr_it == '\t' ) + { + len += myPad()->tabsize(); + } } return len; @@ -805,7 +890,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_TT; + else if ( value == L"tt" ) token = T_IGNORE; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; @@ -945,11 +1030,13 @@ if ( !endtag ) { - preTag = true; // display plain text + preTag = true; // display text preserving newlines and spaces + AdjustPrePad( ech ); } else { preTag = false; + PadNL(); // add new line (text may continue after </pre>) } break; Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCRichText.h Thu May 3 13:06:15 2012 @@ -1,4 +1,3 @@ - /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | @@ -69,8 +68,7 @@ unsigned cindent; bool atbol; - bool preTag; // default is false; set true - // if <pre> tag is found + bool preTag; // <pre> tag unsigned Tattr; @@ -190,7 +188,8 @@ void PadBOL(); void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); - void PadPlainTXT( const wchar_t * sch, const unsigned len ); + void PadPreTXT( const wchar_t * sch, const unsigned len ); + void AdjustPrePad( const wchar_t * sch ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- 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] r68068 - in /branches/SuSE-Code-11-SP1-Branch/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes src/NCPkgTable.cc
by gs＠svn2.opensuse.org 03 May '12

03 May '12

Author: gs Date: Thu May 3 13:03:29 2012 New Revision: 68068 URL: http://svn.opensuse.org/viewcvs/yast?rev=68068&view=rev Log: Better apperance of the license popup - 2.17.17.2 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION Thu May 3 13:03:29 2012 @@ -1 +1 @@ -2.17.17.1 +2.17.17.2 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu May 3 13:03:29 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 3 13:02:05 CEST 2012 - gs(a)suse.de + +- Better apperance of the license popup +- 2.17.17.2 + +------------------------------------------------------------------- Wed Sep 21 09:32:51 CEST 2011 - gs(a)suse.de - Modify spec-file, set 'Requires: yast2-ncurses >= 2.17.18' Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc Thu May 3 13:03:29 2012 @@ -244,9 +244,8 @@ if (!license_confirmed) { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), - NCPkgStrings::NotifyLabel(), - string( _("End User License Agreement") + - "" + pkgName + " " + packager->createDescrText( license ) ), + _("End User License Agreement"), + "" + pkgName + " " + packager->createDescrText( license ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); -- 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] r68067 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 03 May '12

03 May '12

Author: fehr Date: Thu May 3 13:00:53 2012 New Revision: 68067 URL: http://svn.opensuse.org/viewcvs/yast?rev=68067&view=rev Log: version 2.22.2 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=68067&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Thu May 3 13:00:53 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu May 3 13:00:53 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Wed May 2 11:30:00 CEST 2012 - fehr(a)suse.de +- version 2.22.2 - set length proportion between username/password to 2:1 (bnc#760072) - add missing field to table header (bnc#760072) -- 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] r68066 - /tags/stable-2_21_6/nfs-client/
by mfilka＠svn2.opensuse.org 03 May '12

03 May '12

Author: mfilka Date: Thu May 3 11:12:00 2012 New Revision: 68066 URL: http://svn.opensuse.org/viewcvs/yast?rev=68066&view=rev Log: Created tag stable-2_21_6 for nfs-client Added: tags/stable-2_21_6/nfs-client/ (props changed) - copied from r68065, trunk/nfs-client/ -- 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] r68065 - in /trunk/nfs-client: ./ package/ src/ testsuite/tests/
by mfilka＠svn2.opensuse.org 03 May '12

03 May '12

Author: mfilka Date: Thu May 3 11:10:31 2012 New Revision: 68065 URL: http://svn.opensuse.org/viewcvs/yast?rev=68065&view=rev Log: added checkbox for enabling NFS_SECURITY_GSS, bnc#681190 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp trunk/nfs-client/testsuite/tests/readwrite.out trunk/nfs-client/testsuite/tests/readwrite.ycp trunk/nfs-client/testsuite/tests/readwrite2.out trunk/nfs-client/testsuite/tests/readwrite2.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=68065&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Thu May 3 11:10:31 2012 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu May 3 11:10:31 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 3 06:45:39 UTC 2012 - mfilka(a)suse.com + +- added option for enabling NFS4 GSS - bnc#681190 +- 2.21.6 + +------------------------------------------------------------------- Thu Mar 29 15:28:12 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=68065… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu May 3 11:10:31 2012 @@ -74,6 +74,8 @@ global boolean nfs4_enabled = nil; + global boolean nfs_gss_enabled = nil; + global string idmapd_domain = ""; string portmapper = ""; @@ -85,6 +87,10 @@ return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } + boolean ReadNfsGss () { + return (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes"); + } + string ReadIdmapd() { return (string) SCR::Read(.etc.idmapd_conf, "Domain"); } @@ -101,6 +107,12 @@ else nfs4_enabled = ReadNfs4(); + if ( haskey(settings, "enable_nfs_gss") ) { + nfs_gss_enabled = settings["enable_nfs_gss"]:false; + } + else + nfs_gss_enabled = ReadNfsGss(); + if ( haskey(settings, "idmapd_domain") ) { idmapd_domain = settings["idmapd_domain"]:"localdomain"; } @@ -171,6 +183,7 @@ map <string, any> settings = $[]; settings["enable_nfs4"] = nfs4_enabled; + settings["enable_nfs_gss"] = nfs_gss_enabled; settings["idmapd_domain"] = idmapd_domain; list entries = maplist(map entry, nfs_entries, ``{ @@ -299,6 +312,7 @@ } nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + nfs_gss_enabled = (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes"); idmapd_domain = (string) SCR::Read(.etc.idmapd_conf, "Domain"); boolean progress_orig = Progress::set(false); @@ -394,6 +408,8 @@ { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"no"); } + SCR::Write( .sysconfig.nfs.NFS_SECURITY_GSS, nfs_gss_enabled ? "yes" : "no"); + boolean progress_orig = Progress::set (false); SuSEFirewall::WriteOnly (); Progress::set (progress_orig); Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=68065&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu May 3 11:10:31 2012 @@ -239,28 +239,28 @@ `VBox( `VSpacing(0.2), `HBox( - TextAndButton ( - `ComboBox( - `id(`serverent),`opt(`editable), - // text entry label - _("&NFS Server Hostname"), servers ), - // pushbutton label - // choose a host from a list - // appears in help text too - `PushButton (`id (`choose), _("Choo&se")) - ), + TextAndButton ( + `ComboBox( + `id(`serverent),`opt(`editable), + // text entry label + _("&NFS Server Hostname"), servers ), + // pushbutton label + // choose a host from a list + // appears in help text too + `PushButton (`id (`choose), _("Choo&se")) + ), `HSpacing(0.5), - TextAndButton ( + TextAndButton ( `InputField( `id(`pathent), - `opt(`hstretch), - // textentry label - _("&Remote Directory"), pth), - // pushbutton label, + `opt(`hstretch), + // textentry label + _("&Remote Directory"), pth), + // pushbutton label, // select from a list of remote filesystems // make it short // appears in help text too `PushButton (`id (`pathent_list), _("&Select")) - ) + ) ), `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( @@ -561,6 +561,8 @@ `HStretch() ), `VSpacing (1), + `Left(`CheckBox(`id(`enable_nfs_gss), `opt( `notify), _("Enable &GSS Security"))), + `VSpacing (1), fw_cwm_widget["custom_widget"]:`Empty (), `VStretch() ); @@ -595,6 +597,7 @@ UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false); UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); + UI::ChangeWidget(`id(`enable_nfs_gss), `Value, Nfs::nfs_gss_enabled != false); } void SaveFstabEntries( ) @@ -606,6 +609,7 @@ { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs_gss_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs_gss),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } Modified: trunk/nfs-client/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite.out Thu May 3 11:10:31 2012 @@ -1,6 +1,7 @@ Dump Read Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "yes" +Read .sysconfig.nfs.NFS_SECURITY_GSS "yes" Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 @@ -21,6 +22,7 @@ Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "yes" true Write .etc.idmapd_conf ["Domain", "localhost"] true +Write .sysconfig.nfs.NFS_SECURITY_GSS "yes" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Modified: trunk/nfs-client/testsuite/tests/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite.ycp Thu May 3 11:10:31 2012 @@ -118,6 +118,7 @@ "sysconfig": $[ "nfs" : $[ "NFS4_SUPPORT": "yes", + "NFS_SECURITY_GSS": "yes", ], ], "target" : $[ Modified: trunk/nfs-client/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.out Thu May 3 11:10:31 2012 @@ -3,6 +3,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 @@ -24,6 +25,7 @@ Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]] Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] @@ -34,6 +36,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -55,6 +58,7 @@ Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]] Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] @@ -65,6 +69,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -74,6 +79,7 @@ Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0 Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump @@ -81,6 +87,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -90,5 +97,6 @@ Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0 Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Modified: trunk/nfs-client/testsuite/tests/readwrite2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.ycp Thu May 3 11:10:31 2012 @@ -115,6 +115,7 @@ "sysconfig": $[ "nfs" : $[ "NFS4_SUPPORT": "no", + "NFS_SECURITY_GSS": "no", ], ], "target" : $[ -- 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] r68064 - /tags/stable-2_21_9/devtools/
by mfilka＠svn2.opensuse.org 03 May '12

03 May '12

Author: mfilka Date: Thu May 3 10:15:52 2012 New Revision: 68064 URL: http://svn.opensuse.org/viewcvs/yast?rev=68064&view=rev Log: Created tag stable-2_21_9 for devtools Added: tags/stable-2_21_9/devtools/ - copied from r68063, trunk/devtools/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0