November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66763 - in /branches/SuSE-Code-11-SP2-Branch/core: VERSION package/yast2-core.changes
by mvidner＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: mvidner Date: Tue Nov 8 16:16:30 2011 New Revision: 66763 URL: http://svn.opensuse.org/viewcvs/yast?rev=66763&view=rev Log: bump+changes Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION 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 Tue Nov 8 16:16:30 2011 @@ -1 +1 @@ -2.17.40 +2.17.41 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 Tue Nov 8 16:16:30 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 7 18:19:27 CET 2011 - mvidner(a)suse.cz + +- ini-agent: added Write(.section_private.SECTION, BOOLEAN) + (bnc#713661, CVE-2011-3177) +- 2.17.41 + +------------------------------------------------------------------- Thu Aug 18 12:40:23 CEST 2011 - mvidner(a)suse.cz - change blowfish id from 2a to 2y (bnc#700876 bnc#706705 CVE-2011-2483) -- 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] r66762 - in /branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi: private.err private.in.1 private.in.2 private.out private.scr private.ycp
by mvidner＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: mvidner Date: Tue Nov 8 16:16:27 2011 New Revision: 66762 URL: http://svn.opensuse.org/viewcvs/yast?rev=66762&view=rev Log: added test case Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.2 branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.scr branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.ycp (with props) Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err Tue Nov 8 16:16:27 2011 @@ -0,0 +1,11 @@ +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] +[YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] +[agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 Tue Nov 8 16:16:27 2011 @@ -0,0 +1,10 @@ +[Dialer Totalise] +Compuserve = 0 +Provider = Totalise +Phone = 08453001470 +[End] + +[Dialer force9] +Provider = Force9 +Phone = 08451424000 +[End] Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.2 (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.2 Tue Nov 8 16:16:27 2011 @@ -0,0 +1,11 @@ +[Dialer arcor] +Compuserve = 0 +Provider = Arcor +[End] + +[Dialer mobilcom] +Compuserve = 0 +Provider = Mobilcom +Phone = 0101901929 +[End] + Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out Tue Nov 8 16:16:27 2011 @@ -0,0 +1,25 @@ +(nil) +multi/private.in.1.test ------------------------------- +[Dialer Totalise] + Compuserve = 0 + Provider = Totalise + Phone = 08453001470 + Password = Secret password +[End] + +[Dialer force9] + Provider = Force9 + Phone = 08451424000 +[End] +multi/private.in.2.test ------------------------------- +[Dialer arcor] + Compuserve = 0 + Provider = Arcor + Password = Public password +[End] + +[Dialer mobilcom] + Compuserve = 0 + Provider = Mobilcom + Phone = 0101901929 +[End] Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.scr (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.scr Tue Nov 8 16:16:27 2011 @@ -0,0 +1,24 @@ +. + +`ag_ini( + `IniAgent( [ "multi/private.in.*.test" ], + $[ + "rewrite" : [ + [ "multi/private\.in\.(.)\.test$", "multi/private.in.%s.test"], + ], + "subindent" : " ", + "comments": [ "^[ \t]*#.*", "^[ \t]*$" ], + "sections" : [ + $[ + "begin" : [ "[ \t]*\\[Dialer[ \t]+(.*[^ \t])[ \t]*\\][ \t]*", "[Dialer %s]" ], + "end" : [ "^[ \t]*\\[End\\][ \t]*$", "[End]", ], + ], + ], + "params" : [ + $[ + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s = %s"], + ], + ], + ] + ) +) Added: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.ycp Tue Nov 8 16:16:27 2011 @@ -0,0 +1,26 @@ +// +// Multiple files test +// +// providers.rpm +// + + +{ + SCR::RegisterAgent (.target, `ag_system ()); + any out = nil; + + SCR::Write (.v."1"."Totalise"."Password", "Secret password"); + SCR::Write (.section_private."1", true); + + SCR::Write (.v."2"."arcor"."Password", "Public password"); + + SCR::Write (., nil); //flush + + out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.1.test"); + y2milestone("secret file mode: %1", out); + + out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.2.test"); + y2milestone("public file mode: %1", out); + + return nil; +} -- 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] r66761 - in /branches/SuSE-Code-11-SP2-Branch/core/agent-ini: doc/ag_ini.html src/IniAgent.cc src/IniFile.cc src/IniFile.h src/IniParser.cc
by mvidner＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: mvidner Date: Tue Nov 8 16:16:22 2011 New Revision: 66761 URL: http://svn.opensuse.org/viewcvs/yast?rev=66761&view=rev Log: Added Write(.section_private.FILE_SECTION, BOOL) (bnc#713661, CVE-2011-3177) Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniAgent.cc branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.cc branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.h branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html Tue Nov 8 16:16:22 2011 @@ -533,6 +533,13 @@ section was read by.</td> </tr> +<tr> +<td> +<tt>.ini.section_private.sectionname</tt></td> +<td>a boolean write-only property for sections corresponding to files. +If true, the file will not be readable by group and others.</td> +</tr> + <tr class="notimpl"> <td> <tt>.ini.section_file.sectionname.sectionname</tt></td> Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniAgent.cc Tue Nov 8 16:16:22 2011 @@ -98,7 +98,7 @@ else { if (( parser.repeatNames () && value->isList ()) || - (!parser.repeatNames () && (value->isString () || value->isInteger())) || + (!parser.repeatNames () && (value->isString () || value->isBoolean() || value->isInteger())) || path->component_str(0) == "all" ) { Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.cc Tue Nov 8 16:16:22 2011 @@ -75,6 +75,19 @@ return YCPNull (); } +/** + * Return the YCPBoolean or YCPNull if it is not one. Log an error. + */ +static +YCPBoolean as_boolean (const YCPValue& v, const char * context) +{ + if (v->isBoolean ()) + return v->asBoolean (); + ycp2error ("Expected a boolean for %s, got %s %s", + context, v->valuetype_str(), v->toString().c_str()); + return YCPNull (); +} + void IniSection::initValue (const string&key,const string&val,const string&comment,int rb) { string k = ip->changeCase (key); @@ -486,6 +499,9 @@ return setSectionProp (p, v, 0, 1); if (s == "st" || s == "section_type" || s == "sectiontype") return setSectionProp (p, v, rewrite? 1:2, 1); + if (s == "section_private") + return setSectionProp (p, v, 3, 1); + return -1; } @@ -591,12 +607,18 @@ return -1; s.setRewriteBy (i->value()); } - else { + else if (what == 2) { YCPInteger i = as_integer (prop, "section_type"); if (i.isNull()) return -1; s.setReadBy (i->value()); } + else if (what == 3) { + YCPBoolean b = as_boolean (prop, "section_private"); + if (b.isNull()) + return -1; + s.setPrivate (b->value()); + } if (xi != xe) { Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniFile.h Tue Nov 8 16:16:22 2011 @@ -241,6 +241,13 @@ */ string end_comment; + /** + * It is effective only when the section corresponds to a file. + * The file will not be readable by group and others. + * bnc#713661 + */ + bool is_private; + /** index to IniParser::rewrites for filename - section name mapping * It appears that read_by was used for both purposes, * causing bug (#19066). @@ -435,7 +442,7 @@ IniSection (const IniParser *p) : IniBase (-1), ip (p), - end_comment (), rewrite_by(-1), + end_comment (), is_private(false), rewrite_by(-1), container (), ivalues (), isections () {} @@ -446,7 +453,7 @@ IniSection (const IniSection &s) : IniBase (s), ip (s.ip), - end_comment (s.end_comment), rewrite_by (s.rewrite_by), + end_comment (s.end_comment), is_private(s.is_private), rewrite_by (s.rewrite_by), container (s.container) { reindex (); } @@ -458,7 +465,9 @@ } IniBase::operator = (s); ip = s.ip; - end_comment = s.end_comment; rewrite_by = s.rewrite_by; + end_comment = s.end_comment; + is_private = s.is_private; + rewrite_by = s.rewrite_by; container = s.container; reindex (); @@ -474,7 +483,7 @@ IniSection (const IniParser *p, string n) : IniBase (n), ip (p), - end_comment (), rewrite_by(0), + end_comment (), is_private(false), rewrite_by(0), container(), ivalues (), isections () {} /** @@ -511,6 +520,9 @@ */ int getSubSectionRewriteBy (const char*name); + void setPrivate(bool p) { is_private = p; } + bool isPrivate() const { return is_private; } + /** * If there is no comment at the beginning and no values and no * sections, it is better to set is as comment at the beginning. Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc Tue Nov 8 16:16:22 2011 @@ -997,6 +997,12 @@ // ensure that the directories exist Pathname pn(filename); PathInfo::assert_dir (pn.dirname ()); + + mode_t file_umask = section.isPrivate()? 0077: 0022; + mode_t orig_umask = umask(file_umask); + // rewriting an existing file wouldnt change its mode + unlink(filename.c_str()); + ofstream of(filename.c_str()); if (!of.good()) { y2error ("Can not open file %s for write", filename.c_str()); @@ -1006,6 +1012,7 @@ write_helper (section, of, 0); of.close(); + umask(orig_umask); return 0; } -- 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] r66760 - /branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html
by mvidner＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: mvidner Date: Tue Nov 8 16:16:04 2011 New Revision: 66760 URL: http://svn.opensuse.org/viewcvs/yast?rev=66760&view=rev Log: ini-agent docs: fixed syntax highlight in Emacs (trivial) Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/doc/ag_ini.html Tue Nov 8 16:16:04 2011 @@ -280,7 +280,7 @@ Then begin regexp is: ([^=]+)="([^"]*) and end regexp is ([^"]"). These are compared at the end so they are the last possibility. But once we get into this "divided line" by accident, -it becomes greedy, so be carefull to forgotten ". If "multiline" is +it becomes greedy, so be carefull to forgotten ". If "multiline" is not present, this mechanism does not take in effect of course. See also the option <a @@ -473,7 +473,7 @@ "comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ], "params" : [ $[ - "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ], + "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ], "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ], ], $[ @@ -694,7 +694,7 @@ ], "params" : [ $[ - "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s = ], + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s = %s" ], ], ] ) -- 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] r66759 - in /branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src: IniParser.cc IniParser.h
by mvidner＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: mvidner Date: Tue Nov 8 16:15:59 2011 New Revision: 66759 URL: http://svn.opensuse.org/viewcvs/yast?rev=66759&view=rev Log: Factored out IniParser::write_file Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.h Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc Tue Nov 8 16:15:59 2011 @@ -965,19 +965,7 @@ continue; } s.initReadBy (); - // ensure that the directories exist - Pathname pn (filename); - PathInfo::assert_dir (pn.dirname ()); - ofstream of(filename.c_str()); - if (!of.good()) - { - bugs++; - y2error ("Can not open file %s for write", filename.c_str()); - continue; - } - write_helper (s, of, 0); - s.clean(); - of.close (); + bugs += write_file(filename, s); } else { @@ -997,24 +985,30 @@ } else { - // ensure that the directories exist - Pathname pn (file); - PathInfo::assert_dir (pn.dirname ()); - ofstream of(file.c_str()); - if (!of.good()) - { - y2error ("Can not open file %s for write", file.c_str()); - return -1; - } - - write_helper (inifile, of, 0); - - of.close(); + bugs += write_file(file, inifile); timestamp = getTimeStamp (); } - inifile.clean (); return bugs ? -1 : 0; } + +// return 0 on success, like write +int IniParser::write_file(const string & filename, IniSection & section) +{ + // ensure that the directories exist + Pathname pn(filename); + PathInfo::assert_dir (pn.dirname ()); + ofstream of(filename.c_str()); + if (!of.good()) { + y2error ("Can not open file %s for write", filename.c_str()); + return -1; + } + + write_helper (section, of, 0); + + of.close(); + return 0; +} + int IniParser::write_helper(IniSection&ini, ofstream&of, int depth) { char out_buffer[2048]; Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.h Tue Nov 8 16:15:59 2011 @@ -372,6 +372,10 @@ /** * Write one ini file. */ + int write_file(const string & filename, IniSection & section); + /** + * Write one ini file. + */ int write_helper(IniSection&ini, ofstream&of,int depth); public: /** -- 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] r66758 - in /branches/SuSE-Code-11-SP2-Branch/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgRpmGroupTagsFilterView.cc
by tgoettlicher＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: tgoettlicher Date: Tue Nov 8 15:42:54 2011 New Revision: 66758 URL: http://svn.opensuse.org/viewcvs/yast?rev=66758&view=rev Log: - Fixed untranslated rpm package groups (bnc #722325) - 2.21.4 Modified: branches/SuSE-Code-11-SP2-Branch/qt-pkg/VERSION.cmake branches/SuSE-Code-11-SP2-Branch/qt-pkg/package/yast2-qt-pkg.changes branches/SuSE-Code-11-SP2-Branch/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Modified: branches/SuSE-Code-11-SP2-Branch/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt-pkg/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP2-Branch/qt-pkg/VERSION.cmake Tue Nov 8 15:42:54 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: branches/SuSE-Code-11-SP2-Branch/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt-pkg/package/yast2-qt-pkg.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/qt-pkg/package/yast2-qt-pkg.changes Tue Nov 8 15:42:54 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 8 15:41:47 CET 2011 - tgoettlicher(a)suse.de + +- Fixed untranslated rpm package groups (bnc #722325) +- 2.21.4 + +------------------------------------------------------------------- Mon Nov 7 10:15:47 CET 2011 - tgoettlicher(a)suse.de - Fixed typo (bnc #727521) Modified: branches/SuSE-Code-11-SP2-Branch/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Tue Nov 8 15:42:54 2011 @@ -80,6 +80,7 @@ { _rpmGroupsTree = new YRpmGroupsTree(); Q_CHECK_PTR( _rpmGroupsTree ); + _rpmGroupsTree->setTextdomain("qt-pkg"); fillRpmGroupsTree(); } -- 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] r66757 - in /trunk/autoinstallation/doc/xml: PartitioningSection.xml RulesAndClasses.xml
by keichwa＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: keichwa Date: Tue Nov 8 15:02:49 2011 New Revision: 66757 URL: http://svn.opensuse.org/viewcvs/yast?rev=66757&view=rev Log: normalize docbook xml Modified: trunk/autoinstallation/doc/xml/PartitioningSection.xml trunk/autoinstallation/doc/xml/RulesAndClasses.xml Modified: trunk/autoinstallation/doc/xml/PartitioningSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Partiti… ============================================================================== --- trunk/autoinstallation/doc/xml/PartitioningSection.xml (original) +++ trunk/autoinstallation/doc/xml/PartitioningSection.xml Tue Nov 8 15:02:49 2011 @@ -718,18 +718,29 @@ <emphasis>Data Journaling Mode (ordered, journal, writeback):</emphasis> Specifies the journaling mode for file data. </para> - <itemizedlist> - <listitem><emphasis>journal</emphasis>: All data is committed to the + <variablelist> + <varlistentry> + <term>journal</term> + <listitem><para>All data is committed to the journal prior to being written to the main file system. - </listitem> - <listitem><emphasis>ordered</emphasis>: All data is +</para> </listitem> + </varlistentry> + <varlistentry> + <term>ordered</term> + <listitem><para>All data is directly written to the main file system before its meta data is - committed to the journal. - </listitem> - <listitem><emphasis>writeback</emphasis>: Data ordering is not - preserved. + committed to the journal.</para> </listitem> - </itemizedlist> + </varlistentry> + <varlistentry> + <term>writeback</term> + + <listitem> + <para>Data ordering is not + preserved.</para> + </listitem> + </varlistentry> + </variablelist> </listitem> <listitem> <para> Modified: trunk/autoinstallation/doc/xml/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/RulesAn… ============================================================================== --- trunk/autoinstallation/doc/xml/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/xml/RulesAndClasses.xml Tue Nov 8 15:02:49 2011 @@ -786,12 +786,12 @@ merged partition too.<remark>emap 2011-11-07: A little confusing, why not put the merged file here.</remark> </para> <para> - In this example, you don't want a second <emphasis>drive</emphasis>. The two drives should be merged into one. With regard to partitions, three separate ones should be defined. + In this example, you do not want a second <emphasis>drive</emphasis>. The two drives should be merged into one. With regard to partitions, three separate ones should be defined. + </para> <note> <title>Workaround for SLES9/SL 10.0 and earlier</title> <para>The following workaround only works for SLES9/SL 10.0 and earlier versions.</para> </note> - </para> <para>The following method is not officially supported by &ay;. For each partition in one file, add an attribute to the partition: </para> -- 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] r66756 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: gs Date: Tue Nov 8 14:52:37 2011 New Revision: 66756 URL: http://svn.opensuse.org/viewcvs/yast?rev=66756&view=rev Log: improve warning popup when removing interface Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Tue Nov 8 14:52:37 2011 @@ -281,7 +281,6 @@ string command = ""; map output = $[]; - string vlan_interface = ""; string fcoe_vlan_interface = ""; map status_map = $[]; @@ -390,18 +389,22 @@ map output = $[]; string command = ""; // popup text: really remove FCoE VLAN interface - string popup_text = sformat( _("Do you really want to remove the FCoE VLAN device %1?"), + string popup_text = sformat( _("Do you really want to remove the FCoE interface %1?"), card["fcoe_vlan"]:"" ); if ( !Stage::initial() ) { // popup text continues - popup_text = popup_text + "\n" + _( "Please note: The device won't be restored on 'Cancel'." ); + popup_text = popup_text + "\n" + _( "Attention: +Make sure the interface is not essential for a used device. +The interface won't be restored on 'Cancel'." ); } - // headline of a popup - boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), - popup_text ); + boolean ret = Popup::AnyQuestion( Label::WarningMsg(), + popup_text, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no ); // default: Cancel if ( ret == 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] r66755 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgRpmGroupTagsFilterView.cc
by tgoettlicher＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: tgoettlicher Date: Tue Nov 8 14:43:47 2011 New Revision: 66755 URL: http://svn.opensuse.org/viewcvs/yast?rev=66755&view=rev Log: Fixed untranslated rpm package groups (bnc #722325) (2.21.15) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=66755&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Tue Nov 8 14:43:47 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "14") +SET(VERSION_PATCH "15") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Nov 8 14:43:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 8 14:43:20 CET 2011 - tgoettlicher(a)suse.de + +- Fixed untranslated rpm package groups (bnc #722325) +- Version: 2.21.15 + +------------------------------------------------------------------- Fri Nov 4 14:31:32 CET 2011 - tgoettlicher(a)suse.de - Changed default for "Ignore recommended packages for already installed Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilt… ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Tue Nov 8 14:43:47 2011 @@ -80,6 +80,7 @@ { _rpmGroupsTree = new YRpmGroupsTree(); Q_CHECK_PTR( _rpmGroupsTree ); + _rpmGroupsTree->setTextdomain("qt-pkg"); fillRpmGroupsTree(); } -- 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] r66754 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 08 Nov '11

08 Nov '11

Author: gs Date: Tue Nov 8 14:13:52 2011 New Revision: 66754 URL: http://svn.opensuse.org/viewcvs/yast?rev=66754&view=rev Log: don't call 'ifconfig <if> up' (is done by fipvlan), call fipvlan with all interfaces Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Tue Nov 8 14:13:52 2011 @@ -272,45 +272,53 @@ } // -// Check whether a VLAN interface is configured for FCoE on the switch (for given interface) +// Check whether VLAN interfaces are configured for FCoE on the switch // // Params: // string interface network interface card, e.g. eth3 // Return: // string Vlan interface number, e.g. 200 // Example: -// # fipvlan eth3 +// # fipvlan eth0 eth1 eth2 eth3 //Fibre Channel Forwarders Discovered //interface | VLAN | FCF MAC //------------------------------------------ -//eth3 | 200 | 00:0d:ec:a2:ef:00 +//eth0 | 200 | 00:0d:ec:a2:ef:00 +//eth3 | 200 | 00:0d:ec:a2:ef:01 // -global string GetVlanInterface( string interface ) +global map GetVlanInterfaces( list net_devices ) { - string vlan_interface = ""; - map output = $[]; + string vlan_cmd = "LANG=POSIX fipvlan"; + map vlan_info = $[]; - // check whether there is a VLAN interface which is configured for FCoE - string cmd_fcoe = sformat( "LANG=POSIX fipvlan %1", interface ); - y2milestone( "Executing command: %1", cmd_fcoe ); - output = (map)SCR::Execute( .target.bash_output, cmd_fcoe ); + foreach ( string dev, (list<string>)net_devices, { + vlan_cmd = vlan_cmd + " " + dev; + } ); + + // call fipvlan command for all interfaces (saves time because is executed in parallel) + y2milestone( "Executing command: %1", vlan_cmd ); + map output = (map)SCR::Execute( .target.bash_output, vlan_cmd ); y2milestone( "Output: %1", output ); - + list <string> lines = splitstring( output["stdout"]:"", "\n" ); - foreach( string line, (list<string>)lines, { - // check whether there is a line for the given interface, e.g. - // eth3 | 200 | 00:0d:ec:a2:ef:00\n - // and extract name/number of VLAN channel. - if ( String::StartsWith( line, interface ) ) - { - line = deletechars( line, " \t" ); - vlan_interface = substring( line, findfirstof( line, "|" )+1, - findlastof( line, "|" )-findfirstof( line, "|")-1 ); - y2milestone( "VLAN: %1", vlan_interface ); - } + + foreach ( string dev, (list<string>)net_devices, { + foreach( string line, (list<string>)lines, { + // check whether there is a line for the given interface, e.g. + // eth3 | 200 | 00:0d:ec:a2:ef:00\n + // and extract name/number of VLAN channel. + if ( String::StartsWith( line, dev ) ) + { + line = deletechars( line, " \t" ); + string vlan_interface = substring( line, findfirstof( line, "|" )+1, + findlastof( line, "|" )-findfirstof( line, "|")-1 ); + y2milestone( "Interface: %1 VLAN: %2", dev, vlan_interface ); + vlan_info = add( vlan_info, dev, vlan_interface ); + } + } ); } ); - - return vlan_interface; + y2milestone( "VLAN info: %1", vlan_info ); + return vlan_info; } // @@ -625,46 +633,30 @@ if ( netcards == [] || netcards == nil ) return false; + list net_devices = []; + foreach ( map card, netcards, { - // get first state map from link list in resource map - map state_map = card["resource", "link", 0 ]:$[]; + net_devices = add( net_devices, card["dev_name"]:"" ); + }); - if ( state_map["state"]:false == false ) - { - // call 'ifconfig <interface> up' here because it's not yet - // clear who configures the interfaces (fipvlan command itself?) - // -> see bnc #705171 (this applies also to installed system) - string cmd_ifup = sformat( "ifconfig %1 up", card["dev_name"]:"" ); - y2milestone( "Executing command: %1", cmd_ifup ); - SCR::Execute( .target.bash_output, cmd_ifup ); - - // ifconfig up always returns 0 -> no error message can be made - } - } ); - // call .probe.netcard again - netcards = (list<map>)SCR::Read(.probe.netcard); + // The 'fipvlan' command which is called in GetVlanInterfaces configures the interfaces itself, + // therefore it's not needed any longer to call 'ifconfig <if> up' here. + map vlan_info = GetVlanInterfaces( net_devices ); foreach ( map card, netcards, { - map state_map = card["resource", "link", 0]:$[]; map info_map = $[]; map <string, string> status_map = $[]; - string vlan_interface = ""; string fcoe_vlan_interface = ""; string dcb_capable = ""; - - // only call 'fipvlan <interface>' for configured interfaces - if ( state_map["state"]:false == true ) - { - vlan_interface = GetVlanInterface( card["dev_name"]:"" ); - } - if ( vlan_interface == "" ) + + if ( vlan_info[card["dev_name"]:""]:"" == "" ) { // Interface down or FCoE not enabled on the switch - we can't do anything here. fcoe_vlan_interface = NOT_AVAILABLE; } else { - fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); + fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_info[card["dev_name"]:""]:"" ); if ( fcoe_vlan_interface != "" ) { @@ -706,15 +698,18 @@ info_map = add( info_map, "auto_vlan", status_map["AUTO_VLAN"]:"no"); // AUTO_VLAN } info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable - info_map = add( info_map, "vlan_interface", vlan_interface ); // VLAN interface, e.g. 200 + info_map = add( info_map, "vlan_interface", vlan_info[card["dev_name"]:""]:"" ); // VLAN interface, e.g. 200 info_map = add( info_map, "cfg_file", status_map["cfg_device"]:"" ); // part of cfg-file name, e.g. eth3.200 network_interfaces = add( network_interfaces, info_map ); + } ); + // sort the list of interfaces (eth0, eth1, eth2...) network_interfaces = sort( map a, map b, network_interfaces, { return ( a["dev_name"]:"" < b["dev_name"]:"" ); - } ); + } ); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0