April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67854 - in /trunk/packager: package/yast2-packager.changes src/modules/Packages.ycp
by aschnell＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: aschnell Date: Tue Apr 3 14:58:54 2012 New Revision: 67854 URL: http://svn.opensuse.org/viewcvs/yast?rev=67854&view=rev Log: - adapted to move of testX Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 3 14:58:54 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 03 14:58:34 CEST 2012 - aschnell(a)suse.de + +- adapted to move of testX + +------------------------------------------------------------------- Tue Mar 27 17:37:45 UTC 2012 - lslezak(a)suse.cz - removed libxcrypt-devel from buildrequires Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Tue Apr 3 14:58:54 2012 @@ -730,7 +730,7 @@ { packages = [ "xorg-x11", "xorg-x11-server", "xorg-x11-server-glx", "libusb", "sax2", "sax2-gui", "sax2-ident", "sax2-tools", - "sax2-libsax", "sax2-libsax-perl"]; + "sax2-libsax", "sax2-libsax-perl", "yast2-x11" ]; } y2milestone ("X11 Packages to install: %1", packages); @@ -754,6 +754,7 @@ packages = add (packages, "xorg-x11-fonts"); packages = add (packages, "icewm"); packages = add (packages, "sax2-tools"); + packages = add (packages, "yast2-x11"); packages = add (packages, "xinetd"); } @@ -765,6 +766,7 @@ packages = add (packages, "xorg-x11-fonts"); packages = add (packages, "icewm"); packages = add (packages, "sax2-tools"); + packages = add (packages, "yast2-x11"); } if (Linuxrc::braille ()) -- 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] r67853 - in /trunk/installation: package/yast2-installation.changes src/config/Makefile.am src/config/fvwmrc.yast2 src/config/preferences.yast2 startup/YaST2.call yast2-installation.spec.in
by aschnell＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: aschnell Date: Tue Apr 3 14:57:41 2012 New Revision: 67853 URL: http://svn.opensuse.org/viewcvs/yast?rev=67853&view=rev Log: - adapted to move of testX Removed: trunk/installation/src/config/fvwmrc.yast2 trunk/installation/src/config/preferences.yast2 Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/config/Makefile.am trunk/installation/startup/YaST2.call trunk/installation/yast2-installation.spec.in 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 Tue Apr 3 14:57:41 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 03 14:56:55 CEST 2012 - aschnell(a)suse.de + +- adapted to move of testX + +------------------------------------------------------------------- Wed Mar 14 15:42:19 CET 2012 - aschnell(a)suse.de - create link yast.ssh for 2nd stage ssh installation (bnc#745340) Modified: trunk/installation/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/Makefile… ============================================================================== --- trunk/installation/src/config/Makefile.am (original) +++ trunk/installation/src/config/Makefile.am Tue Apr 3 14:57:41 2012 @@ -7,10 +7,6 @@ schemafilesdir = $(schemadir)/autoyast/rnc schemafiles_DATA = $(wildcard *.rnc) -# FIXME -icewmdir= ${sysconfdir}/icewm -icewm_DATA = preferences.yast2 - -EXTRA_DIST = $(desktop_DATA) $(icewm_DATA) $(modconfig_DATA) $(schemafiles_DATA) +EXTRA_DIST = $(desktop_DATA) $(modconfig_DATA) $(schemafiles_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Tue Apr 3 14:57:41 2012 @@ -39,7 +39,7 @@ # the server is ready for requests using this function # --- server_running=0 - TESTX=/usr/sbin/testX + TESTX=/usr/lib/YaST2/bin/testX while kill -0 $xserver_pid 2>/dev/null ; do sleep 1 if test -e /tmp/.X11-unix/X0 && test -x $TESTX ; then @@ -51,13 +51,6 @@ server_running=0 continue fi - # exit code 2 -> color or dimensions doesn't fit... - if test $err = 2;then - log "\tTestX: color or dimensions doesn't fit" - kill $xserver_pid - server_running=0 - break; - fi # server is running, detach oom-killer from it echo -n '-17' > /proc/$xserver_pid/oom_adj server_running=1 @@ -200,7 +193,7 @@ Y2_MODE=ncurses fi else - /usr/sbin/testX --fast 2>/dev/null + /usr/lib/YaST2/bin/testX --fast 2>/dev/null if test $? = 1;then log "\tCannot access Display: $DISPLAY, falling back to ncurses" SELECTED_MEDIUM="NCURSES" @@ -501,7 +494,7 @@ fi # 3.1.8) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium Qt and Gtk disabled" MEDIUM[0]=0 MEDIUM[4]=0 @@ -532,7 +525,7 @@ MEDIUM[2]=0 fi # 3.3.3) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium VNC disabled" MEDIUM[2]=0 fi Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Apr 3 14:57:41 2012 @@ -191,9 +191,6 @@ # programs and scripts @ystartupdir@/startup -# icewm -/etc/icewm - %dir @docdir@ @docdir@/COPYING %readme @docdir@/README -- 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] r67852 - /tags/stable-2_22_6/product-creator/
by jsuchome＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: jsuchome Date: Tue Apr 3 13:13:20 2012 New Revision: 67852 URL: http://svn.opensuse.org/viewcvs/yast?rev=67852&view=rev Log: Created tag stable-2_22_6 for product-creator Added: tags/stable-2_22_6/product-creator/ - copied from r67851, trunk/product-creator/ -- 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] r67851 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: jsuchome Date: Tue Apr 3 11:59:05 2012 New Revision: 67851 URL: http://svn.opensuse.org/viewcvs/yast?rev=67851&view=rev Log: - updated list of compression flags (bnc#755004) - 2.22.6 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6785… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue Apr 3 11:59:05 2012 @@ -1 +1 @@ -2.22.5 +2.22.6 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Apr 3 11:59:05 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 3 11:08:17 CEST 2012 - jsuchome(a)suse.cz + +- updated list of compression flags (bnc#755004) +- 2.22.6 + +------------------------------------------------------------------- Wed Mar 21 14:52:02 CET 2012 - jsuchome(a)suse.cz - locale settings: remove unsupported entries, allow deleting Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Tue Apr 3 11:59:05 2012 @@ -107,8 +107,7 @@ map<string,string> methods = $[ "unified" : "unified", "compressed" : "compressed", - "unified-cromfs" : "unified-cromfs", - "compressed-cromfs" : "compressed-cromfs", + "clic" : "clic", // combo box label "none" : _("None") ]; -- 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] r67850 - /trunk/devtools/devtools/bin/y2autoconf
by aschnell＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: aschnell Date: Tue Apr 3 11:38:49 2012 New Revision: 67850 URL: http://svn.opensuse.org/viewcvs/yast?rev=67850&view=rev Log: - Y2CORE_CFLAGS are actually C++ flags Modified: trunk/devtools/devtools/bin/y2autoconf Modified: trunk/devtools/devtools/bin/y2autoconf URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2autoconf… ============================================================================== --- trunk/devtools/devtools/bin/y2autoconf (original) +++ trunk/devtools/devtools/bin/y2autoconf Tue Apr 3 11:38:49 2012 @@ -280,7 +280,7 @@ PKG_CHECK_MODULES(Y2CORE, yast2-core) ]) -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:=\'-L$(libdir) -lscr\'} -- 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] r67849 - /trunk/core/configure.in.in
by aschnell＠svn2.opensuse.org 03 Apr '12

03 Apr '12

Author: aschnell Date: Tue Apr 3 11:38:07 2012 New Revision: 67849 URL: http://svn.opensuse.org/viewcvs/yast?rev=67849&view=rev Log: - provide Y2CORE_CFLAGS also as Y2CORE_CXXFLAGS (since they are C++ flags) Modified: trunk/core/configure.in.in Modified: trunk/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/configure.in.in?rev=67849&r… ============================================================================== --- trunk/core/configure.in.in (original) +++ trunk/core/configure.in.in Tue Apr 3 11:38:07 2012 @@ -63,10 +63,12 @@ # gnu++0x instead of c++0x so that # we do not lose gnu extensions like typeof Y2CORE_CFLAGS="-std=gnu++0x -DHAVE_CXX0X" + Y2CORE_CXXFLAGS="-std=gnu++0x -DHAVE_CXX0X" AC_MSG_RESULT([c++0x]) ;; *) Y2CORE_CFLAGS="" + Y2CORE_CXXFLAGS="" AC_MSG_RESULT([older than c++0x]) ;; esac -- 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] r67848 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp IscsiLioServer.ycp complex.ycp dialogs.ycp widgets.ycp
by fehr＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: fehr Date: Mon Apr 2 18:41:37 2012 New Revision: 67848 URL: http://svn.opensuse.org/viewcvs/yast?rev=67848&view=rev Log: update as backup Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Mon Apr 2 18:41:37 2012 @@ -224,7 +224,7 @@ }); } -global void SetAuth( string tgt, integer tpg, list<string> incom, string outgo ) +global void SetIetdAuth( string tgt, integer tpg, list<string> incom, string outgo ) { map<string,any> m = GetTgt(data,tgt,tpg); foreach( string s, incom, ``{m=AddIncoming( m, s );}); @@ -258,6 +258,13 @@ return( HasIncomingAuth(tgt,tpg)||HasOutgoingAuth(tgt,tpg) ); } +global map GetAuth( string tgt, integer tpg, string clnt ) + { + map m = GetTgt(data,tgt,tpg); + return( $[ "incoming" : m["incoming",0]:[], + "outgoing" : m["outgoing"]:[] ] ); + } + global map<integer,map> GetLun( string tgt, integer tpg ) { map<integer,map> ret = data["tgt",tgt,tpg,"ep","lun"]:$[]; @@ -580,9 +587,9 @@ list<string> chap = [ "", "" ]; ParseAuthData( "", 0, "", chap, mutual ); if( size(mutual[0]:"")>0 && size(mutual[1]:"")>0 ) - tgmap["outgoing"] = mutual; + ret["outgoing"] = mutual; if( size(chap[0]:"")>0 && size(chap[1]:"")>0 ) - tgmap["incoming"] = [ chap ]; + ret["incoming"] = [ chap ]; foreach( string tgt, map m, endp, { tgmap[tgt] = $[]; @@ -786,6 +793,63 @@ return( ret ); } +global boolean SetAuth( string tgt, integer tpg, string clnt, list inc, list out ) + { + y2milestone( "SetAuth tgt:%1 tpg:%2 clnt:%3 in:%4 out:%5", + tgt, tpg, clnt, inc, out ); + string cmd = ""; + boolean ret = true; + if( size(tgt)==0 ) + { + if( size(inc)>0 ) + { + cmd = "lio_node --setchapdiscauth "; + ret = LogExecCmd( cmd + inc[0]:"" + " " + inc[1]:"" ) && ret; + } + else if(HasIncomingAuth("",0)) + { + ret = false; + y2error( "SetAuth: impossible to disable discovery auth" ); + } + if( size(out)>0 ) + { + cmd = "lio_node --setchapdiscmutualauth "; + ret = LogExecCmd( cmd + out[0]:"" + " " + out[1]:"" ) && ret; + } + else if(HasOutgoingAuth("",0)) + { + ret = false; + y2error( "SetAuth: impossible to disable discovery mutual auth" ); + } + } + else + { + string param = tgt + " " + tpg + " " + clnt; + if( size(inc)>0 ) + { + cmd = "lio_node --setchapauth " + param; + ret = LogExecCmd( cmd + inc[0]:"" + " " + inc[1]:"" ) && ret; + } + else if(HasIncomingAuth(tgt,tpg)) + { + ret = false; + y2error( "SetAuth: impossible to disable auth" ); + } + if( size(out)>0 ) + { + cmd = "lio_node --setchapmutualauth " + param; + ret = LogExecCmd( cmd + out[0]:"" + " " + out[1]:"" ) && ret; + } + else if(HasOutgoingAuth(tgt,tpg)) + { + ret = false; + y2error( "SetAuth: impossible to disable mutual auth" ); + } + } + y2milestone( "SetAuth ret:%1", ret ); + return( ret ); + } + global void UpdateConfig() { data = ParseConfigLio(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp Mon Apr 2 18:41:37 2012 @@ -172,69 +172,80 @@ } // #157643 - reload server -boolean reloadServer(){ -// ask user whether reload or restart server -// #180205 - gettext problem - string wasn't marked to translate -if (Popup::YesNo(_( "If changes have been made, the iSCSI target is not able +boolean reloadServer() + { + return true; + // ask user whether reload or restart server + // #180205 - gettext problem - string wasn't marked to translate + if (Popup::YesNo(_( "If changes have been made, the iSCSI target is not able to reload current configuration. It can only restart. When restarting, all sessions are aborted. Restart the target service? -"))) Service::Restart("target"); - else { +"))) + Service::Restart("target"); + else + { // get changes from perl module - map<string, any> changes = IscsiLioData::GetChanges(); - list<string> connected = IscsiLioData::GetConnected(); + map<string, any> changes = IscsiLioData::GetChanges(); + list<string> connected = IscsiLioData::GetConnected(); // delete targets - foreach(string row, changes["del"]:[], { + foreach(string row, changes["del"]:[], + { if (!contains(connected, row)){ - y2milestone("row to delete %1", row); - string target=((map<string, any>)SCR::Execute(.target.bash_output, + y2milestone("row to delete %1", row); + string target=((map<string, any>)SCR::Execute(.target.bash_output, // get TID number for target "cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ; - string to_delete = splitstring( splitstring(target, " ")[0]:"", ":")[1]:""; - y2milestone("to delete %1", to_delete); - // delete record with that TID - SCR::Execute(.target.bash_output, "ietadm --op delete --tid=$TID", $["TID":to_delete]); - } else y2error("Cannot remove target %1 - already connected", row); - }); + string to_delete = splitstring( splitstring(target, " ")[0]:"", ":")[1]:""; + y2milestone("to delete %1", to_delete); + // delete record with that TID + SCR::Execute(.target.bash_output, "ietadm --op delete --tid=$TID", $["TID":to_delete]); + } + else + y2error("Cannot remove target %1 - already connected", row); + }); // add a new target - foreach(string row, changes["add"]:[], { + foreach(string row, changes["add"]:[], + { y2milestone("row to add %1", row); - // create new target - SCR::Execute(.target.bash_output, "ietadm --op new --tid=0 --params Name=$NAME", $["NAME":row]); - string target=((map<string, any>)SCR::Execute(.target.bash_output, - "cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ; - // get TID of that target + // create new target + SCR::Execute(.target.bash_output, "ietadm --op new --tid=0 --params Name=$NAME", $["NAME":row]); + string target=((map<string, any>)SCR::Execute(.target.bash_output, + "cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ; + // get TID of that target string to_add = splitstring( splitstring(target, " ")[0]:"", ":")[1]:""; y2milestone("to add %1", to_add); - list<string> lun = []; - list <string> secret = []; - // add authentication to target - foreach( map<string, any> conf_row, (list<map<string, any> >) IscsiLioData::GetConfig()[row]:[], { - switch (conf_row["KEY"]:""){ - case("Lun") : lun = splitstring(conf_row["VALUE"]:"", " "); - break; - case("IncomingUser") : secret = splitstring(conf_row["VALUE"]:"", " "); - y2milestone("params %1 %2 %3", to_add, secret[0]:"", secret[1]:""); - SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=IncomingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); - break; - case("OutgoingUser") : secret = splitstring(conf_row["VALUE"]:"", " "); - SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=OutgoingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); - break; - } - }); - string lun_num = lun[0]:""; - string lun_path = splitstring(lun[1]:"", ",")[0]:""; - // add LUN for target - string command = sformat("ietadm --op new --tid=%1 --lun=%2 --params %3", to_add, lun_num, lun_path); - SCR::Execute(.target.bash_output, command, $[]); - y2milestone("lun %1,%2", lun_num, lun_path); - }); - - } - return true; -} + list<string> lun = []; + list <string> secret = []; + // add authentication to target + foreach( map<string, any> conf_row, (list<map<string, any> >) IscsiLioData::GetConfig()[row]:[], + { + switch (conf_row["KEY"]:"") + { + case("Lun") : lun = splitstring(conf_row["VALUE"]:"", " "); + break; + case("IncomingUser") : + secret = splitstring(conf_row["VALUE"]:"", " "); + y2milestone("params %1 %2 %3", to_add, secret[0]:"", secret[1]:""); + SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=IncomingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); + break; + case("OutgoingUser") : + secret = splitstring(conf_row["VALUE"]:"", " "); + SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=OutgoingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); + break; + } + }); + string lun_num = lun[0]:""; + string lun_path = splitstring(lun[1]:"", ",")[0]:""; + // add LUN for target + string command = sformat("ietadm --op new --tid=%1 --lun=%2 --params %3", to_add, lun_num, lun_path); + SCR::Execute(.target.bash_output, command, $[]); + y2milestone("lun %1,%2", lun_num, lun_path); + }); + } + return true; + } /** @@ -409,7 +420,7 @@ if (row["KEY"]:""=="IncomingUser") incom = add(incom, row["VALUE"]:""); else outgoin = row["VALUE"]:""; }); - IscsiLioData::SetAuth("",0,incom, outgoin); + IscsiLioData::SetIetdAuth("",0,incom, outgoin); break; case("targets") : string name = ""; @@ -444,7 +455,7 @@ } }); IscsiLioData::AddNewTarget(name, tpg, lun); - IscsiLioData::SetAuth(name, tpg, inc, out); + IscsiLioData::SetIetdAuth(name, tpg, inc, out); }); break; } Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp Mon Apr 2 18:41:37 2012 @@ -51,6 +51,7 @@ * @return `abort if aborted and `next otherwise */ symbol WriteDialog() { + y2milestone( "WriteDialog" ); Wizard::RestoreHelp(HELPS["write"]:""); // IscsiLioServer::AbortFunction = PollAbort; boolean ret = IscsiLioServer::Write(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Mon Apr 2 18:41:37 2012 @@ -42,8 +42,6 @@ "auto_start_up", `VSpacing (2), "firewall", - `VSpacing (2), - "save", `VSpacing (2) ), `HSpacing (1), @@ -51,7 +49,7 @@ ), `VStretch() ), - "widget_names" : [ "auto_start_up", "firewall", "save" ] + "widget_names" : [ "auto_start_up", "firewall" ] ], // second tab - global authentication "global":$[ @@ -153,53 +151,66 @@ -map<string, map <string, any> > widgets = $[ - "auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[ - "get_service_auto_start" : IscsiLioServer::GetStartService, - "set_service_auto_start" : IscsiLioServer::SetStartService, - // radio button (starting iscsitarget service - option 1) - "start_auto_button" : _("When &Booting"), - // radio button (starting LIO target service - option 2) - "start_manual_button" : _("&Manually"), - "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), - // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") - _("When Booting"), - // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") - _("Manually") +map<string, map <string, any> > widgets = + $[ + "auto_start_up" : + CWMServiceStart::CreateAutoStartWidget ($[ + "get_service_auto_start" : IscsiLioServer::GetStartService, + "set_service_auto_start" : IscsiLioServer::SetStartService, + // radio button (starting iscsitarget service - option 1) + "start_auto_button" : _("When &Booting"), + // radio button (starting LIO target service - option 2) + "start_manual_button" : _("&Manually"), + "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), + // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") + _("When Booting"), + // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") + _("Manually") ), ]), - // firewall - "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ - "services" : [ "service:iscsitarget" ], - "display_details" : true, + // firewall + "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ + "services" : [ "service:iscsitarget" ], + "display_details" : true, ]), - "save" : $[ + "save" : $[ "widget" : `push_button, "label" : Label::SaveButton(), "handle" : saveConfiguration, "opt": [], "help": HELPS["save_configuration"]:"" - ], - "isns" : $[ + ], + "isns" : $[ "widget" : `custom, "custom_widget" : `HBox( - `CheckBoxFrame(`id(`isns_ac), _("iSNS Access Control"), true, - `VBox( - `InputField(`id(`isns_ip), `opt(`hstretch), _("iSNS Server")) - )) - ), + `CheckBoxFrame(`id(`isns_ac), _("iSNS Access Control"), true, + `VBox(`InputField(`id(`isns_ip), `opt(`hstretch), _("iSNS Server")))) + ), "init" : initiSNS, "validate_type" : `function, "validate_function" : validateiSNS, "store" : storeiSNS ], - // discovery authentication dialog - "global_config" : $[ + // discovery authentication dialog + "global_config" : $[ "widget" : `custom, - "custom_widget" : tabs_descr["auth", "contents"]:nil, + "custom_widget" : + `VBox( + `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), + `VSpacing(2), + `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), + `HBox( + `InputField(`id(`user_in), `opt(`hstretch), _("Username")), + `Password(`id(`pass_in), _("Password"))), + `VSpacing(2), + `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), + `HBox( + `InputField(`id(`user_out), `opt(`hstretch), _("Username")), + `Password(`id(`pass_out), _("Password"))) + ), "init" : initGlobal, "handle" : handleAuth, "store" : storeGlobal, Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Mon Apr 2 18:41:37 2012 @@ -119,13 +119,9 @@ // set incoming authentication enabled/disabled status void setAuthIn(boolean status){ y2milestone("Status of AuthIncoming %1", status); - UI::ChangeWidget(`id(`incoming_table),`Enabled, status ); + UI::ChangeWidget(`id(`user_in),`Enabled, status ); + UI::ChangeWidget(`id(`pass_in),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); - - UI::ChangeWidget(`id(`add),`Enabled, status ); - UI::ChangeWidget(`id(`edit),`Enabled, status ); - UI::ChangeWidget(`id(`delete),`Enabled, status ); - if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } @@ -139,25 +135,24 @@ } // get values for incoming authentication -list<string> getIncomingValues(){ - list <string> values = []; - if ((boolean)UI::QueryWidget(`id(`auth_in), `Value) == true){ - integer count = -1; - while (count<size(inc_auth)-1){ - count = count+1; - values=add(values, sformat("%1 %2", inc_auth[count, "USER"]:"", inc_auth[count, "PASS"]:"")); - } - return values; - } else return []; -} +list<string> getIncomingValues() + { + list<string> values = []; + if ((boolean)UI::QueryWidget(`id(`auth_in), `Value) == true) + values = [ (string)UI::QueryWidget(`id(`user_in), `Value), + (string)UI::QueryWidget(`id(`pass_in), `Value) ]; + return values; + } // get values for outgoing authentication -string getOutgoingValues(){ - if ((boolean)UI::QueryWidget(`id(`auth_out), `Value) == true){ - string values = sformat("%1 %2", UI::QueryWidget(`id(`user_out), `Value), UI::QueryWidget(`id(`pass_out), `Value) ); - return values; - } else return ""; -} +list<string> getOutgoingValues() + { + list<string> values = []; + if ((boolean)UI::QueryWidget(`id(`auth_out), `Value) == true) + values = [ (string)UI::QueryWidget(`id(`user_out), `Value), + (string)UI::QueryWidget(`id(`pass_out), `Value) ]; + return values; + } // dialog to add/modify user and password list <string> getDialogValues(string user, string pass){ @@ -189,29 +184,29 @@ } -symbol saveConfiguration(string key, map event){ - if (is(event["ID"]:nil, string) && event["ID"]:"" == "save"){ +symbol saveConfiguration(string key, map event) + { + y2milestone( "saveConfiguration key:%1 event:%2", key, event ); + if( is(event["ID"]:nil, string) && event["ID"]:"" == "save") + { any filename = UI::AskForSaveFileName("/", "*", _("Save as...")); if ( filename != nil && (string)filename!="") - { - if ( IscsiServerFunctions::SaveIntoFile( (string)filename )) { + if( IscsiServerFunctions::SaveIntoFile( (string)filename )) + { Popup::Message(sformat(_("File %1 was saved successfully."), filename)); list pathComponents = splitstring( (string)filename, "/"); integer s = size(pathComponents) - 1; string base = pathComponents[s]:"default"; - } + } else - { + { Popup::Warning(_("An error occurred while saving the file.")); + } } } - } - return nil; -} - - - + return nil; + } // **************** Server Dialog ********************* // dialog with targets @@ -331,150 +326,95 @@ // **************** Global Dialog ********************* -void initGlobalValues(list<map<string, any> > values){ - setAuthIn(false); - setAuthOut(false); - string user = ""; - string pass = ""; - // incoming authentication - inc_auth = $[]; - integer count = 0; - foreach(map<string,any> auth, values, { - if (auth["KEY"]:"" == "IncomingUser") { - user = splitstring(auth["VALUE"]:"", " ")[0]:""; - pass = splitstring(auth["VALUE"]:"", " ")[1]:""; - inc_auth[count] = $["USER":user, "PASS":pass]; - count = count + 1; - setAuthIn(true); - } - if (auth["KEY"]:"" == "OutgoingUser") { - UI::ChangeWidget(`id(`user_out), `Value, splitstring(auth["VALUE"]:"", " ")[0]:""); - UI::ChangeWidget(`id(`pass_out), `Value, splitstring(auth["VALUE"]:"", " ")[1]:""); - setAuthOut(true); +void initGlobalValues(map auth) + { + string user = ""; + string pass = ""; + // incoming authentication + if( size(auth["incoming"]:[])>0 ); + { + user = auth["incoming",0]:""; + pass = auth["incoming",1]:""; + } + UI::ChangeWidget(`id(`user_in), `Value, user ); + UI::ChangeWidget(`id(`pass_in), `Value, pass ); + setAuthIn(size(auth["incoming"]:[])>0); + // outgoing authentication + user = ""; + pass = ""; + if( size(auth["outgoing"]:[])>0 ); + { + user = auth["outgoing",0]:""; + pass = auth["outgoing",1]:""; + } + UI::ChangeWidget(`id(`user_out), `Value, user ); + UI::ChangeWidget(`id(`pass_out), `Value, pass ); + setAuthOut(size(auth["outgoing"]:[])>0); } - }); - UI::ChangeWidget(`id(`incoming_table), `Items, getAuthItems() ); -} // initialize discovery authentication or authentication for given target void initGlobal (string key) { if (size(curr_target)>0) - initGlobalValues(IscsiServerFunctions::getConfig()[curr_target]:[]); + initGlobalValues(IscsiLioData::GetAuth(curr_target,curr_tpg,"")); else - initGlobalValues(IscsiServerFunctions::getConfig()["auth"]:[]); + initGlobalValues(IscsiLioData::GetAuth("",0,"")); } // save discovery authentication or authentication for given target -void storeGlobal(string option_id, map option_map){ - if (size(curr_target)>0){ - - IscsiServerFunctions::setTargetAuth( curr_target, getIncomingValues(), getOutgoingValues() ); - IscsiServerFunctions::saveNewTarget(curr_target); - - } else{ - IscsiServerFunctions::setAuth( getIncomingValues(), getOutgoingValues() ); - } -} +void storeGlobal(string option_id, map option_map) + { + y2milestone( "storeGlobal id:%1 map:%2", option_id, option_map ); + boolean ret = false; + if(size(curr_target)>0) + { + ret = IscsiLioData::SetAuth( curr_target, curr_tpg, "", getIncomingValues(), getOutgoingValues() ); + } + else + { + ret = IscsiLioData::SetAuth( "", 0, "", getIncomingValues(), getOutgoingValues() ); + } + if( !ret ) + { + Popup::Error( _("Problem changing authentication")); + } + IscsiLioData::UpdateConfig(); + } // validate functions checks the secret for incoming and outgoing cannot be same -boolean validateGlobal(string key, map event){ - boolean ret=false; - if (!contains(getIncomingValues(), getOutgoingValues())) ret=true; - else Popup::Error(_("Cannot use the same secret for incoming and outgoing authentication.")); - return ret; -} +boolean validateGlobal(string key, map event) + { + boolean ret=true; + return ret; + } // **************** Target Auth ******************* // handle authentication dialog -symbol handleAuth(string key, map event){ - if (event["EventReason"]:"" == "ValueChanged"){ - boolean status = false; -// enable/disable none/incoming/outgoing authentication - switch((symbol)event["ID"]:nil){ - case(`auth_none): +symbol handleAuth(string key, map event) + { + if (event["EventReason"]:"" == "ValueChanged") + { + boolean status = false; + // enable/disable none/incoming/outgoing authentication + switch((symbol)event["ID"]:nil) + { + case(`auth_none): status = (boolean)UI::QueryWidget(`id(`auth_none), `Value); setAuthIn(!status); setAuthOut(!status); break; - case(`auth_in): + case(`auth_in): status = (boolean)UI::QueryWidget(`id(`auth_in), `Value); setAuthIn(status); break; - case(`auth_out): + case(`auth_out): status = (boolean)UI::QueryWidget(`id(`auth_out), `Value); setAuthOut(status); break; - } - } -// add/edit/delete incoming authentication - if (event["EventReason"]:"" == "Activated"){ - switch((symbol)event["ID"]:nil){ - case(`add) : - list<string> values = getDialogValues("", ""); - y2milestone("Add authentication values"); - if (size(values)==2 ){ - string user = values[0]:""; - string pass = values[1]:""; - integer count = size((list)UI::QueryWidget(`id (`incoming_table),`Items)); - - inc_auth[size(inc_auth)]= $["USER":user, "PASS":pass]; - UI::ChangeWidget (`id (`incoming_table), `Items, getAuthItems()); - } - - break; - case(`edit) : - integer curr = tointeger( UI::QueryWidget(`id (`incoming_table),`CurrentItem) ); - y2milestone("Modify authentication values"); - if (curr!=nil){ - string user = inc_auth[curr, "USER"]:""; - string pass = inc_auth[curr, "PASS"]:""; - list<string> values = getDialogValues(user, pass); - - if (size(values)==2 ){ - string user = values[0]:""; - string pass = values[1]:""; - - list<term> rows = (list<term>)UI::QueryWidget(`id (`incoming_table),`Items); - inc_auth[curr] = $["USER":user, "PASS":pass]; - UI::ChangeWidget (`id (`incoming_table), `Items, getAuthItems()); - } - - } - break; - case(`delete) : - any del = UI::QueryWidget(`id (`incoming_table),`CurrentItem); - y2milestone("Delete authentication value"); - if (del != nil){ - if (Popup::ContinueCancel(_("Really delete the selected item?"))) - { - integer count = 0; - map<integer, any> temp_map = $[]; - while(count<size(inc_auth)) - { - if (count<del) - temp_map[count]=inc_auth[count]:nil; - else if (count>del) - temp_map[count-1]=inc_auth[count]:nil; - count = count+1; - } - inc_auth = temp_map; - UI::ChangeWidget(`id(`incoming_table), `Items, getAuthItems()); - } else y2milestone("Delete canceled"); - } - break; - } - } - if (size((list)UI::QueryWidget(`incoming_table, `Items))==0){ - UI::ChangeWidget(`edit, `Enabled, false); - UI::ChangeWidget(`delete, `Enabled, false); - } else { - UI::ChangeWidget(`edit, `Enabled, true); - UI::ChangeWidget(`delete, `Enabled, true); - } - - return nil; -} + } + } + return nil; + } // **************** Edit Dialog ***************************** -- 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] r67847 - in /branches/SuSE-Code-11-SP3-Branch/storage: libstorage/src/Disk.cc package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 17:53:56 2012 New Revision: 67847 URL: http://svn.opensuse.org/viewcvs/yast?rev=67847&view=rev Log: - calculate max_primary for artificial XEN disks (bnc#754649) Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Disk.cc Mon Apr 2 17:53:56 2012 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2012] Novell, Inc. * * All Rights Reserved. * @@ -70,12 +70,14 @@ Disk::Disk(Storage* s, const string& name, const string& device, unsigned num, unsigned long long SizeK, SystemInfo& systeminfo) : Container(s, name, device, staticType(), systeminfo), + max_primary(0), ext_possible(false), max_logical(0), init_disk(false), transport(TUNKNOWN), dmp_slave(false), no_addpart(false), - gpt_enlarge(false), del_ptable(false) + gpt_enlarge(false), range(255), del_ptable(false) { y2mil("constructed Disk name:" << name << " nr " << num << " sizeK:" << SizeK); logfile_name = name + decString(num); ronly = true; + label = "xenxvd"; // artificial size_k = SizeK; addPartition( num, size_k, systeminfo ); } @@ -684,6 +686,7 @@ { "dasd", false, 3, 0, (1ULL << 32) - 1 }, { "aix", false, 0, 0, (1ULL << 32) - 1 }, { "amiga", false, 63, 0, (1ULL << 32) - 1 }, + { "xenxvd", false, 256, 0, (1ULL << 32) - 1 }, // artificial { "", false, 0, 0, 0 } }; @@ -2393,6 +2396,7 @@ p->setSize( sz ); } addToList( p ); + max_primary = max(max_primary, num); } unsigned Disk::numPartitions() const Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Mon Apr 2 17:53:56 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 02 16:11:03 CEST 2012 - aschnell(a)suse.de + +- calculate max_primary for artificial XEN disks (bnc#754649) + +------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de - patched proofread texts back into source code -- 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] r67846 - in /trunk/x11: package/yast2-x11.changes yast2-x11.spec.in
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 13:53:02 2012 New Revision: 67846 URL: http://svn.opensuse.org/viewcvs/yast?rev=67846&view=rev Log: - requires c++ during build since yast macros check for it Modified: trunk/x11/package/yast2-x11.changes trunk/x11/yast2-x11.spec.in Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Mon Apr 2 13:53:02 2012 @@ -2,10 +2,6 @@ Mon Apr 02 12:33:52 CEST 2012 - aschnell(a)suse.de - added icewm config to keep Firefox window on top (bnc#749184) - -------------------------------------------------------------------- -Mon Apr 02 11:40:42 CEST 2012 - aschnell(a)suse.de - - created package with testX binary from sax2-tools and window-manager config from yast2-installation - 2.22.0 Modified: trunk/x11/yast2-x11.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/yast2-x11.spec.in?rev=67846&… ============================================================================== --- trunk/x11/yast2-x11.spec.in (original) +++ trunk/x11/yast2-x11.spec.in Mon Apr 2 13:53:02 2012 @@ -3,8 +3,8 @@ @HEADER@ Group: System/YaST License: GPL-2.0, GPL-2.0+ -BuildRequires: autoconf automake libtool xorg-x11-libX11-devel xorg-x11-libXmu-devel -BuildRequires: yast2-devtools +BuildRequires: autoconf automake gcc-c++ libtool xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXmu-devel yast2-devtools Summary: YaST2 - X11 support %description -- 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] r67845 - /tags/stable-2_22_0/x11/
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:42:19 2012 New Revision: 67845 URL: http://svn.opensuse.org/viewcvs/yast?rev=67845&view=rev Log: Created tag stable-2_22_0 for x11 Added: tags/stable-2_22_0/x11/ - copied from r67844, trunk/x11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67844 - in /trunk/x11: package/yast2-x11.changes src/config/Makefile.am src/config/winoptions src/tools/testX.c
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:40:16 2012 New Revision: 67844 URL: http://svn.opensuse.org/viewcvs/yast?rev=67844&view=rev Log: - added icewm config to keep Firefox window on top (bnc#749184) Added: trunk/x11/src/config/winoptions Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/config/Makefile.am trunk/x11/src/tools/testX.c Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Mon Apr 2 12:40:16 2012 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- +Mon Apr 02 12:33:52 CEST 2012 - aschnell(a)suse.de + +- added icewm config to keep Firefox window on top (bnc#749184) + +------------------------------------------------------------------- Mon Apr 02 11:40:42 CEST 2012 - aschnell(a)suse.de - created package with testX binary from sax2-tools and window-manager config from yast2-installation +- 2.22.0 Modified: trunk/x11/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/Makefile.am?rev=6… ============================================================================== --- trunk/x11/src/config/Makefile.am (original) +++ trunk/x11/src/config/Makefile.am Mon Apr 2 12:40:16 2012 @@ -2,9 +2,12 @@ # Makefile.am for x11/src/config # -icewmdir= /etc/icewm +icewmdir = /etc/icewm icewm_DATA = preferences.yast2 -EXTRA_DIST = $(icewm_DATA) +icewmprivdir = /etc/icewm/yast2 +icewmpriv_DATA = winoptions + +EXTRA_DIST = $(icewm_DATA) $(icewmpriv_DATA) include $(top_srcdir)/Makefile.am.common Added: trunk/x11/src/config/winoptions URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/winoptions?rev=67… ============================================================================== --- trunk/x11/src/config/winoptions (added) +++ trunk/x11/src/config/winoptions Mon Apr 2 12:40:16 2012 @@ -0,0 +1 @@ +Toplevel.Mozilla.layer: OnTop Modified: trunk/x11/src/tools/testX.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/testX.c?rev=67844&… ============================================================================== --- trunk/x11/src/tools/testX.c (original) +++ trunk/x11/src/tools/testX.c Mon Apr 2 12:40:16 2012 @@ -5,14 +5,14 @@ : BELONGS TO : Configuration tool X11 version 4.x : YaST2 inst-sys tools - : + : DESCRIPTION : Checks if the X server is ok and sets the root : window's color. Forks a child that creates an - : invisible X client. The child exits when the - : X server exits. + : invisible X client. The child exits when the + : X server exits. : : Exit code: 0: X server ok, 1: no X server. - : + : STATUS : Status: Up-to-date **************/ @@ -29,19 +29,17 @@ //====================================== // Defines //-------------------------------------- -#define TWM "twm" -#define MWM "mwm" -#define FVWM "fvwm2" #define ICEWM "icewm" +#define FVWM "fvwm2" +#define MWM "mwm" +#define TWM "twm" -#define FVWMRC "fvwmrc.yast2" #define ICEWMPREFS "preferences.yast2" +#define FVWMRC "fvwmrc.yast2" //====================================== // Globals //-------------------------------------- -char *fore_color = NULL; -char *back_color = NULL; int screen; //====================================== @@ -51,17 +49,17 @@ XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel); int RunWindowManager(void); -int main(int argc, char **argv) +int main(int argc, char** argv) { Cursor cursor; Display *display; Window root; unsigned long pixel; - char *cname; + char* cname; XColor color; Atom prop; Pixmap save_pixmap = (Pixmap)None; - + //============================================ // open display and check if we got a display //-------------------------------------------- @@ -81,7 +79,7 @@ screen = DefaultScreen(display); root = RootWindow(display, screen); pixel = BlackPixel(display, screen); - + if (XParseColor(display, DefaultColormap(display, screen), cname, &color)) { if (XAllocColor(display, DefaultColormap(display, screen), &color)) { pixel = color.pixel; @@ -89,7 +87,7 @@ } XSetWindowBackground(display, root, pixel); XClearWindow(display, root); - + //============================================ // set watch cursor //-------------------------------------------- @@ -98,12 +96,12 @@ XDefineCursor(display, root, cursor); XFreeCursor(display, cursor); } - + //============================================ // run the windowmanager (FVWM) //-------------------------------------------- RunWindowManager(); - + //============================================ // save background as pixmap //-------------------------------------------- @@ -112,7 +110,7 @@ XChangeProperty(display, root, prop, XA_PIXMAP, 32, PropModeReplace, (unsigned char*) &save_pixmap, 1); XSetCloseDownMode(display, RetainPermanent); - + //============================================ // close display and exit //-------------------------------------------- @@ -128,7 +126,9 @@ XColor fg, bg; int i; Font fid; - + char* fore_color = NULL; + char* back_color = NULL; + fg = NameToXColor(dpy, fore_color, BlackPixel(dpy, screen)); bg = NameToXColor(dpy, back_color, WhitePixel(dpy, screen)); @@ -147,7 +147,7 @@ XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel) { XColor c; - + if (!name || !*name) { c.pixel = pixel; XQueryColor(dpy, DefaultColormap(dpy, screen), &c); @@ -170,6 +170,7 @@ return 0; break; case 0: + setenv("ICEWM_PRIVCFG", "/etc/icewm/yast2", 1); execlp(ICEWM, "icewm", "-c", ICEWMPREFS, "-t", "yast2", NULL); execlp(FVWM, "fvwm2", "-f", FVWMRC, NULL); execlp(MWM, "mwm", NULL); -- 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] r67843 - in /trunk/x11: ./ package/ src/ src/config/ src/tools/
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:27:34 2012 New Revision: 67843 URL: http://svn.opensuse.org/viewcvs/yast?rev=67843&view=rev Log: - updated ignores Modified: trunk/x11/ (props changed) trunk/x11/package/ (props changed) trunk/x11/src/ (props changed) trunk/x11/src/config/ (props changed) trunk/x11/src/tools/ (props changed) -- 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] r67842 - in /trunk/x11: ./ package/ src/ src/config/ src/tools/
by aschnell＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: aschnell Date: Mon Apr 2 12:22:27 2012 New Revision: 67842 URL: http://svn.opensuse.org/viewcvs/yast?rev=67842&view=rev Log: - created package with testX binary from sax2-tools and window-manager config from yast2-installation Added: trunk/x11/ trunk/x11/MAINTAINER trunk/x11/Makefile.am trunk/x11/Makefile.cvs trunk/x11/RPMNAME trunk/x11/VERSION trunk/x11/configure.in.in trunk/x11/package/ trunk/x11/package/yast2-x11.changes trunk/x11/src/ trunk/x11/src/Makefile.am trunk/x11/src/config/ trunk/x11/src/config/Makefile.am trunk/x11/src/config/fvwmrc.yast2 trunk/x11/src/config/preferences.yast2 trunk/x11/src/tools/ trunk/x11/src/tools/Makefile.am trunk/x11/src/tools/testX.c trunk/x11/yast2-x11.spec.in Added: trunk/x11/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/MAINTAINER?rev=67842&view=au… ============================================================================== --- trunk/x11/MAINTAINER (added) +++ trunk/x11/MAINTAINER Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +Arvin Schnell <aschnell(a)suse.de> Added: trunk/x11/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/Makefile.am?rev=67842&view=a… ============================================================================== --- trunk/x11/Makefile.am (added) +++ trunk/x11/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,201 @@ +# Emacs: -*- makefile -*- +# +# Toplevel Makefile.am for a YaST2 subproject +# +# -- This file is generated by y2automake - DO NOT EDIT! -- +# (Edit ./SUBDIRS instead) +# + +#where devtools are +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool + +VERSION = $(shell cat $(srcdir)/VERSION) +RPMNAME = $(shell cat $(srcdir)/RPMNAME) +SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) +ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) + +HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) + +# do we do Makefile.am for devtools? It is a little special... +IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) + +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) + +COPYRIGHT_files_gpl = README COPYING + +COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ + COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish + +extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) + +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +# where devtools install m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal + +Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common + cmp -s $< $@ || cp -f $< $@ + +# create bzip2ed tar and make some sanity checks +$(RPMNAME)-$(VERSION).tar.bz2: checkpo dist-bzip2 + @if [ `bunzip2 -c $(RPMNAME)-$(VERSION).tar.bz2 | wc --bytes` = 0 ] ; then \ + echo "Error: created tar is empty" ; \ + exit 1 ; \ + fi + +CLEANFILES = +MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec + +POT_DST = $(shell find -type d -name testsuite -prune , \ + -type f -name "*.pot") + +EXTRA_DIST = \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ + $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) + +show-extra-dist: + @echo $(EXTRA_DIST) + +# info '(automake)Conditionals' +if CREATE_PKGCONFIG +# create the file here instead of by configure +# because the prerequisite is made here (not anymore!) +# and we don't want any paths in y2autoconf +# info '(autoconf)config.status Invocation' +$(RPMNAME).pc: $(RPMNAME).pc.in config.status + ./config.status --file=$@:$< + +if CREATE_PKGCONFIG_NOARCH +pkgconfigdata_DATA = $(RPMNAME).pc +else +pkgconfig_DATA = $(RPMNAME).pc +endif + +EXTRA_DIST += $(RPMNAME).pc.in +endif + +dist-hook: + @for I in $(extra_COPYRIGHT_files) ; \ + do \ + EX="" ; \ + if test -f $(srcdir)/$$I ; then \ + EX=$(srcdir)/$$I ; \ + elif test -f $(LEGALESE_DIR)/$$I ; then \ + EX=$(LEGALESE_DIR)/$$I ; \ + else \ + echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ + exit 1 ; \ + fi ; \ + echo "cp $$EX $(distdir)" ; \ + cp $$EX "$(distdir)" ; \ + done + +pot: + $(Y2TOOL) y2makepot -s $(srcdir) + +install-pot: pot + @POT_DST=`find -type d -name testsuite -prune , \ + -type f -name "*.pot"` ; \ + if [ -n "$$POT_DST" ] ; then \ + echo "mkdir -p $(DESTDIR)$(potdir)" ; \ + mkdir -p $(DESTDIR)$(potdir) ; \ + list="$$POT_DST"; \ + for I in $$list ; \ + do \ + echo $$I ; \ + if [ "$$I" == "pot" ] ; then \ + continue ; \ + fi ; \ + echo "$(INSTALL_DATA) $$I $(DESTDIR)$(potdir)" ; \ + $(INSTALL_DATA) $$I $(DESTDIR)$(potdir) ; \ + done ; \ + fi + +spellcheck: pot + $(Y2TOOL) pot-spellcheck + +# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) + +install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) + mkdir -p $(DESTDIR)$(docdir) + @for I in $(extra_COPYRIGHT_files) ; \ + do \ + EX="" ; \ + if test -f $(srcdir)/$$I ; then \ + EX=$(srcdir)/$$I ; \ + elif test -f $(LEGALESE_DIR)/$$I ; then \ + EX=$(LEGALESE_DIR)/$$I ; \ + else \ + echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ + exit 1 ; \ + fi ; \ + echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ + $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ + done + +package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 + rm -f package/$(RPMNAME)-*.tar.bz2 + rm -f package/*~ + rm -f package/*.bak + rm -f package/*.auto + mv $(RPMNAME)-$(VERSION).tar.bz2 package/ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ + echo "You have to install yast2-devtools to making a package"; \ + false; \ + fi + here=`pwd`; \ + cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + done + +package: check-up-to-date check-tagversion check-textdomain package-local + +TAGVERSION = $(Y2TOOL) tagversion + +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ + fi + +check-tagversion: + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ + [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) + +check-parse-old: + @if [ `find -type f -name "*.ycp" | wc -l` -gt 0 -a "$(RPMNAME)" != "yast2-core" ] ; then \ + echo "Running parseycp..." ; \ + parseycp -q -R ; \ + else \ + echo "Not running parseycp." ; \ + fi + +check-parse: + @echo "Not running parseycp." + +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + +stable: checkin-stable + +checkin-stable: package + $(Y2TOOL) checkin-stable + + +# For po/ modules +checkpo: + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox +# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am +SUBDIRS = src Added: trunk/x11/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/Makefile.cvs?rev=67842&view=… ============================================================================== --- trunk/x11/Makefile.cvs (added) +++ trunk/x11/Makefile.cvs Mon Apr 2 12:22:27 2012 @@ -0,0 +1,23 @@ +# +# Makefile.cvs +# + +LIB = $(shell y2tool get-lib) + +PREFIX = /usr + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install -v + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/x11/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/RPMNAME?rev=67842&view=auto ============================================================================== --- trunk/x11/RPMNAME (added) +++ trunk/x11/RPMNAME Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +yast2-x11 Added: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=67842&view=auto ============================================================================== --- trunk/x11/VERSION (added) +++ trunk/x11/VERSION Mon Apr 2 12:22:27 2012 @@ -0,0 +1 @@ +2.22.0 Added: trunk/x11/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/configure.in.in?rev=67842&vi… ============================================================================== --- trunk/x11/configure.in.in (added) +++ trunk/x11/configure.in.in Mon Apr 2 12:22:27 2012 @@ -0,0 +1,12 @@ +## configure.in.in for yast2-x11 + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-PROGRAM@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-PROGRAM@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (added) +++ trunk/x11/package/yast2-x11.changes Mon Apr 2 12:22:27 2012 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Mon Apr 02 11:40:42 CEST 2012 - aschnell(a)suse.de + +- created package with testX binary from sax2-tools and + window-manager config from yast2-installation + Added: trunk/x11/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/Makefile.am?rev=67842&vi… ============================================================================== --- trunk/x11/src/Makefile.am (added) +++ trunk/x11/src/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,5 @@ +# +# Makefile.am for x11/src +# + +SUBDIRS = config tools Added: trunk/x11/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/Makefile.am?rev=6… ============================================================================== --- trunk/x11/src/config/Makefile.am (added) +++ trunk/x11/src/config/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,10 @@ +# +# Makefile.am for x11/src/config +# + +icewmdir= /etc/icewm +icewm_DATA = preferences.yast2 + +EXTRA_DIST = $(icewm_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/x11/src/config/fvwmrc.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/fvwmrc.yast2?rev=… ============================================================================== --- trunk/x11/src/config/fvwmrc.yast2 (added) +++ trunk/x11/src/config/fvwmrc.yast2 Mon Apr 2 12:22:27 2012 @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +# +#============================= +# Colorset dark/dark +#----------------------------- +# *FvwmTheme: Colorset 20 fg black, bg black +# ModuleSynchronous Timeout 5 FvwmTheme + +#============================= +# Globals +#----------------------------- +EdgeResistance 250 10 +EdgeScroll 100 100 +ClickTime 750 +DeskTopSize 1x1 +ColormapFocus FollowsMouse +OpaqueMoveSize unlimited + +#============================= +# Menu Style +#----------------------------- +HideGeometryWindow +MenuStyle * Foreground black, Background grey80 + +#============================= +# Default Style +#----------------------------- +DefaultFont "StringEncoding=UTF-8:xft:sans-serif:encoding=iso10646-1:size=13;-gnu-unifont-medium-r-normal--16-160-75-75-c-80-*-*,-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*,*" + +#============================= +# Global Styles +#----------------------------- +Style * BorderWidth 3, HandleWidth 3 +Style * MWMFunctions +Style * MWMDecor, HintOverride +Style * DecorateTransient, NoPPosition +Style * ClickToFocus +Style * TileCascadePlacement +Style * ResizeOpaque +Style * MWMBorder +Style * HilightFore white, HilightBack black +Style * ForeColor black, BackColor white +Style * BorderColorset 0 +Style * HilightBorderColorset 0 + +#============================= +# Title Style +#----------------------------- +TitleStyle ActiveUp (solid #4e6f9f -- Flat) +TitleStyle ActiveDown (solid #4e6f9f -- Flat) +TitleStyle Inactive (solid #c3c3c3 -- Flat) + +#============================= +# Mouse Bindings +#----------------------------- +Mouse 1 R A WindowList +Mouse 2 R A WindowList +Mouse 3 R A WindowList +Mouse 4 R A WindowList +Mouse 5 R A WindowList +Mouse 1 F A Resize-or-Raise +Mouse 1 TS A Move-or-Raise +Mouse 1 I A Move-or-Iconify + +#============================= +# Functions +#----------------------------- +AddToFunc Move-or-Raise I Raise ++ M Move + +AddToFunc Move-or-Iconify I Raise ++ M Move + +AddToFunc Resize-or-Raise I Raise ++ M Resize + +AddToFunc InitFunction I Module FvwmCommandS Added: trunk/x11/src/config/preferences.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/preferences.yast2… ============================================================================== --- trunk/x11/src/config/preferences.yast2 (added) +++ trunk/x11/src/config/preferences.yast2 Mon Apr 2 12:22:27 2012 @@ -0,0 +1,117 @@ +# IceWM configuration file for use during installation + +# Hide taskbar +ShowTaskBar=0 + +# Hide titlebar buttons and window menu +TitleButtonsLeft="" +TitleButtonsRight="" +WinMenuItems="" + +# Enable Alt+Tab +QuickSwitch=1 +KeySysSwitchNext="Alt+Tab" +KeySysSwitchLast="Alt+Shift+Tab" + +# Disable Windows key +Win95Keys=0 + +# Colors +ColorActiveTitleBar="rgb:4e/6f/9f" +ColorNormalTitleBar="rgb:c3/c3/c3" + +# Borders +BorderSizeX=3 +BorderSizeY=3 +DlgBorderSizeX=3 +DlgBorderSizeY=3 + +# Disable most shortcuts +# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences | grep -v Switch | sed 's/$/=""/' +KeyWinRaise="" +KeyWinOccupyAll="" +KeyWinLower="" +KeyWinClose="" +KeyWinRestore="" +KeyWinPrev="" +KeyWinNext="" +KeyWinMove="" +KeyWinSize="" +KeyWinMinimize="" +KeyWinMaximize="" +KeyWinMaximizeVert="" +KeyWinMaximizeHoriz="" +KeyWinFullscreen="" +KeyWinHide="" +KeyWinRollup="" +KeyWinMenu="" +KeyWinArrangeN="" +KeyWinArrangeNE="" +KeyWinArrangeE="" +KeyWinArrangeSE="" +KeyWinArrangeS="" +KeyWinArrangeSW="" +KeyWinArrangeW="" +KeyWinArrangeNW="" +KeyWinArrangeC="" +KeySysWinNext="" +KeySysWinPrev="" +KeySysWinMenu="" +KeySysDialog="" +KeySysMenu="" +KeySysWindowList="" +KeySysWinListMenu="" +KeySysAddressBar="" +KeySysWorkspacePrev="" +KeySysWorkspaceNext="" +KeySysWorkspaceLast="" +KeySysWorkspacePrevTakeWin="" +KeySysWorkspaceNextTakeWin="" +KeySysWorkspaceLastTakeWin="" +KeySysWorkspace1="" +KeySysWorkspace2="" +KeySysWorkspace3="" +KeySysWorkspace4="" +KeySysWorkspace5="" +KeySysWorkspace6="" +KeySysWorkspace7="" +KeySysWorkspace8="" +KeySysWorkspace9="" +KeySysWorkspace10="" +KeySysWorkspace11="" +KeySysWorkspace12="" +KeySysWorkspace1TakeWin="" +KeySysWorkspace2TakeWin="" +KeySysWorkspace3TakeWin="" +KeySysWorkspace4TakeWin="" +KeySysWorkspace5TakeWin="" +KeySysWorkspace6TakeWin="" +KeySysWorkspace7TakeWin="" +KeySysWorkspace8TakeWin="" +KeySysWorkspace9TakeWin="" +KeySysWorkspace10TakeWin="" +KeySysWorkspace11TakeWin="" +KeySysWorkspace12TakeWin="" +KeySysTileVertical="" +KeySysTileHorizontal="" +KeySysCascade="" +KeySysArrange="" +KeySysArrangeIcons="" +KeySysMinimizeAll="" +KeySysHideAll="" +KeySysUndoArrange="" +KeySysShowDesktop="" +KeySysCollapseTaskBar="" + +# Disable root window menus +# :r !grep -o '\<Desktop[^=]*Button=' /etc/icewm/preferences | sed 's/$/0/' +DesktopWinMenuButton=0 +DesktopWinListButton=0 +DesktopMenuButton=0 + +# Disable maximize and rollup +TitleBarMaximizeButton=0 +TitleBarRollupButton=0 + +# Disable possibility to move the base window, BNC 466827 +ClientWindowMouseActions=0 Added: trunk/x11/src/tools/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/Makefile.am?rev=67… ============================================================================== --- trunk/x11/src/tools/Makefile.am (added) +++ trunk/x11/src/tools/Makefile.am Mon Apr 2 12:22:27 2012 @@ -0,0 +1,11 @@ +# +# Makefile.am for x11/src/tools +# + +ybin_PROGRAMS = testX + +testX_SOURCES = \ + testX.c + +testX_LDFLAGS = \ + -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lX11 -lXmu Added: trunk/x11/src/tools/testX.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/tools/testX.c?rev=67842&… ============================================================================== --- trunk/x11/src/tools/testX.c (added) +++ trunk/x11/src/tools/testX.c Mon Apr 2 12:22:27 2012 @@ -0,0 +1,184 @@ +/************** +FILE : testX.c +*************** +PROJECT : SaX ( SuSE advanced X configuration ) + : +BELONGS TO : Configuration tool X11 version 4.x + : YaST2 inst-sys tools + : +DESCRIPTION : Checks if the X server is ok and sets the root + : window's color. Forks a child that creates an + : invisible X client. The child exits when the + : X server exits. + : + : Exit code: 0: X server ok, 1: no X server. + : +STATUS : Status: Up-to-date +**************/ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/Xmu/CurUtil.h> +#include <sys/types.h> +#include <sys/wait.h> + +//====================================== +// Defines +//-------------------------------------- +#define TWM "twm" +#define MWM "mwm" +#define FVWM "fvwm2" +#define ICEWM "icewm" + +#define FVWMRC "fvwmrc.yast2" +#define ICEWMPREFS "preferences.yast2" + +//====================================== +// Globals +//-------------------------------------- +char *fore_color = NULL; +char *back_color = NULL; +int screen; + +//====================================== +// Functions +//-------------------------------------- +Cursor CreateCursorFromName(Display* dpy, const char* name); +XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel); +int RunWindowManager(void); + +int main(int argc, char **argv) +{ + Cursor cursor; + Display *display; + Window root; + unsigned long pixel; + char *cname; + XColor color; + Atom prop; + Pixmap save_pixmap = (Pixmap)None; + + //============================================ + // open display and check if we got a display + //-------------------------------------------- + display = XOpenDisplay(NULL); + if (!display) { + exit (1); + } + if ((argc == 2) && (strcmp(argv[1], "--fast") == 0)) { + XCloseDisplay(display); + exit (0); + } + + //============================================ + // install color map for background pixels + //-------------------------------------------- + cname = argc == 2 ? argv[1] : "black"; + screen = DefaultScreen(display); + root = RootWindow(display, screen); + pixel = BlackPixel(display, screen); + + if (XParseColor(display, DefaultColormap(display, screen), cname, &color)) { + if (XAllocColor(display, DefaultColormap(display, screen), &color)) { + pixel = color.pixel; + } + } + XSetWindowBackground(display, root, pixel); + XClearWindow(display, root); + + //============================================ + // set watch cursor + //-------------------------------------------- + cursor = CreateCursorFromName(display, "top_left_arrow"); + if (cursor) { + XDefineCursor(display, root, cursor); + XFreeCursor(display, cursor); + } + + //============================================ + // run the windowmanager (FVWM) + //-------------------------------------------- + RunWindowManager(); + + //============================================ + // save background as pixmap + //-------------------------------------------- + save_pixmap = XCreatePixmap(display, root, 1, 1, 1); + prop = XInternAtom(display, "_XSETROOT_ID", False); + XChangeProperty(display, root, prop, XA_PIXMAP, 32, PropModeReplace, + (unsigned char*) &save_pixmap, 1); + XSetCloseDownMode(display, RetainPermanent); + + //============================================ + // close display and exit + //-------------------------------------------- + XCloseDisplay(display); + exit (0); +} + +//========================================= +// CreateCursorFromName +//----------------------------------------- +Cursor CreateCursorFromName(Display* dpy, const char* name) +{ + XColor fg, bg; + int i; + Font fid; + + fg = NameToXColor(dpy, fore_color, BlackPixel(dpy, screen)); + bg = NameToXColor(dpy, back_color, WhitePixel(dpy, screen)); + + i = XmuCursorNameToIndex(name); + if (i == -1) + return (Cursor) 0; + fid = XLoadFont (dpy, "cursor"); + if (!fid) + return (Cursor) 0; + return XCreateGlyphCursor(dpy, fid, fid, i, i+1, &fg, &bg); +} + +//========================================= +// NameToXColor +//----------------------------------------- +XColor NameToXColor(Display* dpy, const char* name, unsigned long pixel) +{ + XColor c; + + if (!name || !*name) { + c.pixel = pixel; + XQueryColor(dpy, DefaultColormap(dpy, screen), &c); + } else if (!XParseColor(dpy, DefaultColormap(dpy, screen), name, &c)) { + fprintf(stderr, "testX: unknown color or bad color format: %s\n", name); + exit(1); + } + return c; +} + +//========================================= +// RunWindowManager +//----------------------------------------- +int RunWindowManager(void) +{ + int wmpid = fork(); + switch (wmpid) + { + case -1: + return 0; + break; + case 0: + execlp(ICEWM, "icewm", "-c", ICEWMPREFS, "-t", "yast2", NULL); + execlp(FVWM, "fvwm2", "-f", FVWMRC, NULL); + execlp(MWM, "mwm", NULL); + execlp(TWM, "twm", NULL); + fprintf(stderr, "testX: could not run any windowmanager"); + return 0; + break; + default: + waitpid(wmpid, NULL, WNOHANG | WUNTRACED); + } + return 1; +} Added: trunk/x11/yast2-x11.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/yast2-x11.spec.in?rev=67842&… ============================================================================== --- trunk/x11/yast2-x11.spec.in (added) +++ trunk/x11/yast2-x11.spec.in Mon Apr 2 12:22:27 2012 @@ -0,0 +1,29 @@ +@HEADER-COMMENT@ + +@HEADER@ +Group: System/YaST +License: GPL-2.0, GPL-2.0+ +BuildRequires: autoconf automake libtool xorg-x11-libX11-devel xorg-x11-libXmu-devel +BuildRequires: yast2-devtools +Summary: YaST2 - X11 support + +%description +This package contains the programs and files for YaST2 X11 support. + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) + +@ybindir@/testX +/etc/icewm + +%doc %dir @docdir@ +%doc @docdir@/README* +%doc @docdir@/COPY* -- 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] r67841 - /tags/stable-2_22_5/security/
by jsuchome＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: jsuchome Date: Mon Apr 2 10:45:15 2012 New Revision: 67841 URL: http://svn.opensuse.org/viewcvs/yast?rev=67841&view=rev Log: Created tag stable-2_22_5 for security Added: tags/stable-2_22_5/security/ - copied from r67840, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67840 - in /trunk/security: VERSION package/yast2-security.changes testsuite/tests/Level2.ycp
by jsuchome＠svn2.opensuse.org 02 Apr '12

02 Apr '12

Author: jsuchome Date: Mon Apr 2 10:44:56 2012 New Revision: 67840 URL: http://svn.opensuse.org/viewcvs/yast?rev=67840&view=rev Log: - testsuite: explicitely set the output of target.stat - 2.22.5 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/testsuite/tests/Level2.ycp Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=67840&r1=67… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Mon Apr 2 10:44:56 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Mon Apr 2 10:44:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 2 10:27:53 CEST 2012 - jsuchome(a)suse.cz + +- testsuite: explicitely set the output of target.stat +- 2.22.5 + +------------------------------------------------------------------- Thu Mar 29 15:59:20 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/security/testsuite/tests/Level2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.ycp (original) +++ trunk/security/testsuite/tests/Level2.ycp Mon Apr 2 10:44:56 2012 @@ -29,7 +29,11 @@ "displaymanager" : $[ "DISPLAYMANAGER" : "", ] - ] + ], + "target" : $[ + // FileUtils::Exists returns false: + "stat" : $[] + ], ]; Security::Settings = Levels["Level2"]:$[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0