March 2007 - openSUSE Commits - openSUSE Mailing Lists

commit smlnj
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package smlnj checked in at Thu Mar 1 21:37:27 CET 2007. -------- --- arch/i386/smlnj/smlnj.changes 2006-11-21 14:33:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/smlnj/smlnj.changes 2007-03-01 15:19:33.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 15:19:08 CET 2007 - schwab(a)suse.de + +- Hack to build as non-root. + +------------------------------------------------------------------- Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smlnj.spec ++++++ --- /var/tmp/diff_new_pack.l10128/_old 2007-03-01 21:37:01.000000000 +0100 +++ /var/tmp/diff_new_pack.l10128/_new 2007-03-01 21:37:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package smlnj (Version 110.60) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,9 +12,9 @@ Name: smlnj Summary: Standard ML of New Jersey Version: 110.60 -Release: 1 +Release: 7 Group: Development/Languages/Other -License: BSD License and BSD-like, Other License(s), see package +License: BSD License and BSD-like URL: http://www.smlnj.org/ Source: smlnj-%{version}.tar.bz2 Patch: config.diff @@ -49,21 +49,29 @@ %install mkdir -p $RPM_BUILD_ROOT%{_libdir}/smlnj -rm -rf %{_libdir}/smlnj -ln -s $RPM_BUILD_ROOT%{_libdir}/smlnj %{_libdir}/smlnj -CFLAGS=$RPM_OPT_FLAGS INSTALLDIR=%{_libdir}/smlnj config/install.sh +CFLAGS=$RPM_OPT_FLAGS INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/smlnj config/install.sh mkdir -p $RPM_BUILD_ROOT%{_bindir} -for f in %{_libdir}/smlnj/bin/*; do - ln -sf $f $RPM_BUILD_ROOT%{_bindir} - echo %{_bindir}/${f##*/} -done > bin-files +n=${RPM_BUILD_ROOT//?/ } +for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/.heap/sml.*; do + perl -pi -e "s|\Q$RPM_BUILD_ROOT\E([^\0]*.)|\1$n|" $f +done +for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/*; do + sed -i -e "s,$RPM_BUILD_ROOT,," $f + ln -sf ${f#$RPM_BUILD_ROOT} $RPM_BUILD_ROOT%{_bindir} +done +for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/.*-sml; do + sed -i -e "s,$RPM_BUILD_ROOT,," $f +done -%files -f bin-files +%files %defattr(-, root, root) %doc %{version}-* HISTORY +%{_bindir}/* %{_libdir}/smlnj -%changelog -n smlnj +%changelog +* Thu Mar 01 2007 - schwab(a)suse.de +- Hack to build as non-root. * Tue Nov 21 2006 - schwab(a)suse.de - Update to version 110.60. * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-repair
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package yast2-repair checked in at Thu Mar 1 21:37:10 CET 2007. -------- --- yast2-repair/yast2-repair.changes 2007-02-13 09:51:24.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2007-03-01 15:40:21.846153000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 1 15:24:36 CET 2007 - jsuchome(a)suse.cz + +- check the products (installed vs repairing) for name and version, + give possibility to continue even when they differ (#195265) +- 2.15.3 + +------------------------------------------------------------------- Old: ---- yast2-repair-2.15.2.tar.bz2 New: ---- yast2-repair-2.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-repair.spec ++++++ --- /var/tmp/diff_new_pack.Bw7482/_old 2007-03-01 21:36:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Bw7482/_new 2007-03-01 21:36:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-repair (Version 2.15.2) +# spec file for package yast2-repair (Version 2.15.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-repair -Version: 2.15.2 +Version: 2.15.3 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-repair-2.15.2.tar.bz2 +Source0: yast2-repair-2.15.3.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage @@ -34,7 +34,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-repair-2.15.2 +%setup -n yast2-repair-2.15.3 %build %{prefix}/bin/y2tool y2autoconf @@ -68,7 +68,11 @@ /usr/share/YaST2/include/repair/* %doc %{prefix}/share/doc/packages/yast2-repair -%changelog -n yast2-repair +%changelog +* Thu Mar 01 2007 - jsuchome(a)suse.cz +- check the products (installed vs repairing) for name and version, + give possibility to continue even when they differ (#195265) +- 2.15.3 * Tue Feb 13 2007 - jsuchome(a)suse.cz - fixed failing testsuites (Mode::test now works correctly) - 2.15.2 ++++++ yast2-repair-2.15.2.tar.bz2 -> yast2-repair-2.15.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/src/osr_module_packages.ycp new/yast2-repair-2.15.3/src/osr_module_packages.ycp --- old/yast2-repair-2.15.2/src/osr_module_packages.ycp 2006-12-20 14:16:59.000000000 +0100 +++ new/yast2-repair-2.15.3/src/osr_module_packages.ycp 2007-03-01 15:17:13.000000000 +0100 @@ -115,16 +115,7 @@ // error text in summary OSRSummary::DetectError ("", _("Different versions of products")); OSRStatus::ErrorSeverityModuleBlocking (); - // error popup, %1 is tool name ('System repair') - Popup::Error (sformat (_("You are using %1 from a product -different than the installed one. - -Because the package database of the installed product -can be broken, only the package database on the installation -media can be used for package database checking. - -Checking the package database is not possible and will be skipped."), - OSRCommon::tool_name)); + return false; } return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/src/OSRPkg.ycp new/yast2-repair-2.15.3/src/OSRPkg.ycp --- old/yast2-repair-2.15.2/src/OSRPkg.ycp 2006-12-20 14:16:59.000000000 +0100 +++ new/yast2-repair-2.15.3/src/OSRPkg.ycp 2007-03-01 15:21:07.000000000 +0100 @@ -302,24 +302,43 @@ integer source_id = 1; - // TODO we could use Packages::theSources list curr_sources = Pkg::SourceGetCurrent (true); source_id = curr_sources[0]:source_id; - map source_product = Pkg::SourceProduct (source_id); + map source_product = Pkg::SourceProductData (source_id); list all_products = Pkg::TargetProducts (); map target_product = all_products[0]:$[]; y2debug ("source product: %1", source_product); y2debug ("target_product: %1", target_product); - if (source_product["product"]:"" != target_product["product"]:"") + if (source_product["productname"]:"" != target_product["name"]:"" || + source_product["productversion"]:"" != target_product["version"]:"") { - y2error("target product (%1) is different from source product (%2)", - target_product["product"]:"", source_product["product"]:""); - y2warning ("source product: %1", source_product); - y2warning ("target_product: %1", target_product); - return false; + y2warning ("target product (%1-%2) is probably different from source product (%3-%4)", + target_product["name"]:"", target_product["version"]:"", + source_product["productname"]:"", source_product["productversion"]:""); + y2milestone ("source product: %1", source_product); + y2milestone ("target_product: %1", target_product); + // continue/cancel popup, %1 is tool name ('System repair') + // %2-%3 are name and version of product with yast2-repair (e.g. the one on CD/DVD) + // %4-%5 are name and version of installed product (the one being checked/repaired) + if (!Popup::ContinueCancel (sformat (_("You seem to be using %1 from +a product (%2 %3) different +than the installed one (%4 %5). + +Because the package database of the installed product +can be damaged, only the package database from the correct +installation media can be used for package database checking. +Checking the package database with a different product +should be skipped. + +Really continue?"), + OSRCommon::tool_name, + source_product["productname"]:"", source_product["productversion"]:"", + target_product["name"]:"", target_product["version"]:"")) + ) + return false; } return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/VERSION new/yast2-repair-2.15.3/VERSION --- old/yast2-repair-2.15.2/VERSION 2007-02-13 09:39:47.000000000 +0100 +++ new/yast2-repair-2.15.3/VERSION 2007-03-01 15:27:04.000000000 +0100 @@ -1 +1 @@ -2.15.2 +2.15.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squid-beta
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package squid-beta checked in at Thu Mar 1 21:36:54 CET 2007. -------- --- squid-beta/squid-beta.changes 2007-01-22 17:12:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/squid-beta/squid-beta.changes 2007-02-27 20:10:42.422673000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 20:09:47 CET 2007 - kssingvo(a)suse.de + +- fixed ulimit setting: maxfd is now changed as official FAQ suggests + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid-beta.spec ++++++ --- /var/tmp/diff_new_pack.sY5817/_old 2007-03-01 21:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sY5817/_new 2007-03-01 21:36:12.000000000 +0100 @@ -13,7 +13,7 @@ BuildRequires: expat gcc-c++ krb5 libxml2-devel openldap2 openldap2-devel opensp-devel pam-devel sharutils Summary: Squid V3.0 WWW Proxy Server (new version) Version: 3.0 -Release: 291 +Release: 295 License: GNU General Public License (GPL) %define ver PRE5 URL: http://www.squid-cache.org @@ -220,7 +220,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIE -fPIC -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" export LDFLAGS='-pie' -ulimit -n 4096 touch NEWS AUTHORS aclocal automake @@ -265,6 +264,14 @@ --enable-x-accelerator-vary # problematic options # --enable-truncate \ +# overwrite the number of open filedescriptors of configure to 4096 +# to be backward compatible, but numbers above should not be overwritten +if [ `awk '/SQUID_MAXFD/{print $3}' include/autoconf.h` -lt 4096 ]; then + set +x + echo "adapting SQUID_MAXFD to 4096" + set -x + perl -pi -e 's;(\#define SQUID_MAXFD) [0-9]+;$1 4096;' include/autoconf.h +fi make DEFAULT_LOG_PREFIX=/var/log/squid \ DEFAULT_SWAP_DIR=/var/cache/squid \ DEFAULT_PID_FILE=/var/run/squid.pid \ @@ -419,7 +426,9 @@ #%doc README.squid_ldapauth CREDITS.squid_ldapauth #%doc squid_ldapauth.conf -%changelog -n squid-beta +%changelog +* Tue Feb 27 2007 - kssingvo(a)suse.de +- fixed ulimit setting: maxfd is now changed as official FAQ suggests * Mon Jan 22 2007 - kssingvo(a)suse.de - removed duplicate PreReq from specfile (bugzilla#236285) * Thu Jan 18 2007 - kssingvo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-online-update
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package yast2-online-update checked in at Thu Mar 1 21:36:31 CET 2007. -------- --- yast2-online-update/yast2-online-update.changes 2007-02-20 14:39:06.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2007-03-01 14:54:39.500104000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 1 14:07:15 CET 2007 - jsuchome(a)suse.cz + +- added basic command line support (#249306) +- removed obsoleted variables and files +- 2.15.7 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.15.6.tar.bz2 New: ---- yast2-online-update-2.15.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.nP6015/_old 2007-03-01 21:36:13.000000000 +0100 +++ /var/tmp/diff_new_pack.nP6015/_new 2007-03-01 21:36:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.15.6) +# spec file for package yast2-online-update (Version 2.15.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.15.6 +Version: 2.15.7 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.15.6.tar.bz2 +Source0: yast2-online-update-2.15.7.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -48,7 +48,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.15.6 +%setup -n yast2-online-update-2.15.7 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,7 @@ /usr/share/YaST2/schema/autoyast/rnc/online_update.rnc /usr/share/YaST2/scrconf/*.scr /usr/share/YaST2/clients/online*.ycp +/usr/share/YaST2/clients/cd_update.ycp /usr/share/YaST2/clients/inst_you.ycp /usr/share/YaST2/modules/OnlineUpdate*.ycp /usr/share/YaST2/modules/OnlineUpdate*.ybc @@ -142,6 +143,10 @@ %ghost %{prefix}/share/applications/YaST2/cd_update.desktop %changelog +* Thu Mar 01 2007 - jsuchome(a)suse.cz +- added basic command line support (#249306) +- removed obsoleted variables and files +- 2.15.7 * Tue Feb 20 2007 - jsuchome(a)suse.cz - do not change Finish button label (#246497) - 2.15.6 ++++++ yast2-online-update-2.15.6.tar.bz2 -> yast2-online-update-2.15.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/cd_update.desktop new/yast2-online-update-2.15.7/src/cd_update.desktop --- old/yast2-online-update-2.15.6/src/cd_update.desktop 2005-09-08 10:33:24.000000000 +0200 +++ new/yast2-online-update-2.15.7/src/cd_update.desktop 2007-03-01 14:09:15.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-cd_update -Exec=/sbin/yast2 online_update .cd_default +Exec=/sbin/yast2 online_update cd_update Name=Patch CD Update GenericName=Install patches from CD to correct and improve your existing installation diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/cd_update.ycp new/yast2-online-update-2.15.7/src/cd_update.ycp --- old/yast2-online-update-2.15.6/src/cd_update.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/cd_update.ycp 2007-03-01 13:48:19.000000000 +0100 @@ -0,0 +1,6 @@ +/** + * Summary: Client for calling CD update + */ +{ + return WFM::CallFunction ("online_update", prepend (WFM::Args (), "cd_update")); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/Makefile.am new/yast2-online-update-2.15.7/src/Makefile.am --- old/yast2-online-update-2.15.6/src/Makefile.am 2007-02-16 14:59:18.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/Makefile.am 2007-03-01 11:41:52.000000000 +0100 @@ -4,12 +4,12 @@ rncdir = $(schemadir)/autoyast/rnc client_DATA = \ - online_update_start.ycp \ online_update_auto.ycp \ online_update_select.ycp \ online_update_install.ycp \ online_update.ycp \ online_update_setup.ycp \ + cd_update.ycp \ inst_you.ycp module_DATA = \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/Makefile.in new/yast2-online-update-2.15.7/src/Makefile.in --- old/yast2-online-update-2.15.6/src/Makefile.in 2007-02-16 16:02:26.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/Makefile.in 2007-03-01 13:25:22.000000000 +0100 @@ -219,12 +219,12 @@ # rncdir = $(schemadir)/autoyast/rnc client_DATA = \ - online_update_start.ycp \ online_update_auto.ycp \ online_update_select.ycp \ online_update_install.ycp \ online_update.ycp \ online_update_setup.ycp \ + cd_update.ycp \ inst_you.ycp module_DATA = \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/online_update_install.ycp new/yast2-online-update-2.15.7/src/online_update_install.ycp --- old/yast2-online-update-2.15.6/src/online_update_install.ycp 2007-02-19 15:10:49.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/online_update_install.ycp 2007-02-20 14:39:25.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: YOU installation page * Authors: Cornelius Schumacher <cschum(a)suse.de> * - * $Id: online_update_install.ycp 35532 2007-01-19 13:05:59Z jsuchome $ + * $Id: online_update_install.ycp 36312 2007-02-20 13:39:23Z jsuchome $ * * This is a client for installation. * It displays the dialog with a progress of the actual installation and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/online_update_start.ycp new/yast2-online-update-2.15.7/src/online_update_start.ycp --- old/yast2-online-update-2.15.6/src/online_update_start.ycp 2006-10-31 09:15:50.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/online_update_start.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,534 +0,0 @@ -/** - * Package: Online update - * Summary: Start update, display last update info, choose mode (auto|manual) - * Authors: Gabriele Strattner <gs(a)suse.de> - * Stefan Schubert <schubi(a)suse.de> - * Cornelius Schumacher <cschum(a)suse.de> - */ - -{ - - textdomain "online-update"; - - import "Label"; - import "Mode"; - import "OnlineUpdate"; - import "Popup"; - import "Wizard"; - import "AutoOnlineUpdate"; - import "OnlineUpdateDialogs"; - - include "packager/inst_source_dialogs.ycp"; - - map server = $[ "url": "" ]; - - // Request username/password from user - define map DisplayLoginPopup( string username, string password, - string headline, string message ) ``{ - map ret_map = $[]; - - string usernameLabel = _("&Username:"); - - UI::OpenDialog( - `opt(`decorated), - `HBox( - `HSpacing(1), - `VBox( - `Left(`Heading( headline )), - `VSpacing(0.2), - `Label( message ), - `Frame (_("Authentication Data"), - `VBox ( - `HBox ( - `HSpacing (0.5), - `TextEntry ( `id(`username), usernameLabel, username ), - `HSpacing (0.5) - ), - `HBox ( - `HSpacing (0.5), - `Password ( `id(`password), _("&Password:"), password ), - `HSpacing (0.5) - ))), - `VSpacing(0.2), - `CheckBox(`id(`keep), _("&Keep Authentication Data"), false ), - `VSpacing(0.2), - `PushButton(`id(`clear), _("&Clear Inputs")), - `VSpacing(0.2), - `HBox(`PushButton(`id(`login), `opt(`default), _("&Login") ), - `PushButton(`id(`abort), Label::CancelButton() ) - ), - `VSpacing(0.2) - - ), - `HSpacing(1) - ) - ); - - UI::SetFocus( `id(`username) ); - - any ret = `nil; - - do { - ret = UI::UserInput(); - - if ( ret == `login ) - { - ret_map = add(ret_map, "username", UI::QueryWidget(`id(`username), `Value)); - ret_map = add(ret_map, "password", UI::QueryWidget(`id(`password), `Value)); - ret_map = add(ret_map, "persistent", UI::QueryWidget(`id(`keep), `Value)); - ret_map = add(ret_map, "login", true ); - } - else if ( ret == `clear ) - { - UI::ChangeWidget( `id(`username), `Value, "" ); - UI::ChangeWidget( `id(`password), `Value, "" ); - } - else - { - ret_map = add(ret_map, "login", false); - } - } while ( ret == `clear ); - - UI::CloseDialog(); - - return ret_map; - }; - - /* set YOU server and fetch patches - * server: server map as returned by YouGetServers - * auth: authentication map (fields "username","password","persistent") - */ - - define string GetPatches(map server, map usermap) ``{ - - UI::OpenDialog( `opt( `decorated ), - `VBox( - `VSpacing( 0.2 ), - `ProgressBar( `id( `progress ), _("Retrieving information about new updates...") ), - `VSpacing( 0.2 ), - `PushButton( `id( `abort ), Label::AbortButton() ), - `VSpacing( 0.2 ) - ) - ); - - Pkg::YouSetServer( server ); - - string url = server["url"]:""; - map parsed_url = URL::Parse (url); - string protocol = parsed_url["scheme"]:""; - boolean auth_set = size(usermap["username"]:"") > 0; - if (auth_set) { - y2debug("Authentication passed in."); - Pkg::YouSetUserPassword(usermap["username"]:"", usermap["password"]:"", false); - } - if ( (! auth_set) && (protocol == "ftp" || protocol == "http" || protocol == "smb") ) - { - string username = parsed_url["user"]:""; - string password = parsed_url["pass"]:""; - auth_set = size (username) > 0; - if (auth_set) - { - usermap = $[ - "username" : username, - "password" : password, - ]; - }; - } - if (! auth_set) - { - usermap = Pkg::YouGetUserPassword(); - } - - y2error ("Server: %1", server); - - string err = Pkg::YouGetDirectory(); - - y2error ("err: %1", err); - - if ( err == "login" ) { - string username = usermap[ "username" ]:""; - string password = usermap[ "password" ]:""; - string headline = _("Authorization"); - string msg_string = _("Enter the registration data."); - - map registration_map = DisplayLoginPopup( username, password, - headline, msg_string ); - - if ( registration_map[ "login" ]: false ) { - Pkg::YouSetUserPassword( registration_map[ "username" ]:"", - registration_map[ "password" ]:"", - registration_map[ "persistent" ]:false ); - err = ""; - } else { - err = "abort"; - } - } - - if ( err == "" ) { - err = Pkg::YouRetrievePatchInfo( OnlineUpdate::reload, - OnlineUpdate::signature_check ); - } - - UI::CloseDialog(); - - return err; - - }; - - - ///////////////////////////////////////////////////////////////////////////////////// - // MAIN: - ///////////////////////////////////////////////////////////////////////////////////// - - - boolean cd_update = OnlineUpdate::cd_update; - - list you_server_list = [ $[ "url": "", "name": _("User-Defined Location") ] ]; - - string you_url = OnlineUpdate::you_url; - - map auth = $[]; /* keeps authentication data for most recent custom server */ - - y2milestone( "you_url: %1", you_url ); - - map statusmap = Pkg::YouStatus(); - y2debug("status map: %1", statusmap ); - - string mirrorListServer = statusmap["mirrorurl"]:"www.suse.de"; - - string initMessage = ""; - if ( cd_update ) { - initMessage = _("Initializing for CD update..."); - you_url = "cd:///"; - } else { - initMessage = sformat( _("Getting a list of mirror servers...")/*, mirrorListServer*/ ); - } - UI::OpenDialog(`opt(`decorated ),`Label( initMessage )); - - if ( size( you_url ) != 0 ) { - server[ "url" ] = you_url; - you_server_list = add( you_server_list, server ); - } else { - symbol result = `retry; - do { - string err = Pkg::YouGetServers( you_server_list ); - if ( size( err ) == 0 ) { - result = `ok; - } else { - y2error( "Get Servers: %1", err ); - if ( err == "get" ) { - string text = _("Cannot fetch remote server list. Only user-defined patch -sources will be available. - -Possible solution: -Check network connection. -"); - result = OnlineUpdateDialogs::IgnoreWarningPopup( text, - sformat( _("URL: %1"), mirrorListServer ) + "\n" + - Pkg::LastErrorDetails() ); - } else if ( err == "read" ) { - result = OnlineUpdateDialogs::IgnorePopup( _("Unable to read server list from disk."), - Pkg::LastErrorDetails() ); - } else if ( err == "write" ) { - result = OnlineUpdateDialogs::IgnorePopup( _("Could not write server list to disk."), - Pkg::LastErrorDetails() ); - } else { - result = OnlineUpdateDialogs::IgnorePopup( _("Error getting servers."), - Pkg::LastErrorDetails() ); - } - if ( result == `abort ) - { - UI::CloseDialog(); - return result; - } - } - } while ( result == `retry ); - } - - UI::CloseDialog(); - - string status_product = statusmap["product"]:"unknown"; - string status_version = statusmap["version"]:"unknown"; - string status_basearch = statusmap["basearch"]:"unknown"; - integer status_lastupdate = statusmap["lastupdate"]:-1; - - string lastupdateLabel = ""; - - if ( status_lastupdate == -1 ) { - lastupdateLabel = _("There was no update executed up to now."); - } else if ( status_lastupdate == 0 ) { - lastupdateLabel = _("Last successful update was performed less than one day ago."); - } else { - lastupdateLabel = _("Last successful update was performed %1 day ago.", - "Last successful update was performed %1 days ago.", - status_lastupdate ); - } - - list servers = []; - integer i = 0; - while ( i < size( you_server_list ) ) { - map server = you_server_list[ i ]:$[]; - string name = server[ "name" ]:""; - string url = server[ "url" ]:""; - string text = ""; - if ( size( name ) == 0 ) text = url; - else text = name; - servers = add( servers, `item( `id( i ), text ) ); - i = i + 1; - } - - boolean manualSelection = true; - if ( OnlineUpdate::you_auto || - SCR::Read( .sysconfig.onlineupdate.YOU_MANUAL_SELECTION ) == "no") { - manualSelection = false; - } - - // layout main dialog - - term contents = - `VBox( - `VSpacing( 0.3 ), - `HBox( - `HWeight(1, `Empty()), - `HWeight(10, - `Frame ( _("System &Information"), - `VBox( - `VSpacing(0.3), - `HBox(`HSpacing(0.8), - `Left( `Label( sformat( lastupdateLabel , status_lastupdate ) ) ) - ), - `VSpacing(0.5), - `HBox(`HSpacing(0.8), - `Left( `Label( sformat( _("Product: %1"), status_product ) ) ), - `HSpacing(0.8) - ), - `HBox(`HSpacing(0.8), - `Left( `Label( sformat( _("Version: %1"), status_version ) ) ) - ), -// `HBox(`HSpacing(0.8), -// `Left( `Label( sformat( _("Base Architecture: %1"), status_basearch ) ) ) -// ), - `VSpacing(0.3) - ) - ) - ), - `HWeight(1, `Empty()) - ), - `VSpacing(1.0), - `HBox( - `HWeight(1, `Empty()), - `HWeight(10, - `Frame (_("Update Configuration"), - `VBox( - `VSpacing(0.3), - `VSquash( - `HBox( - `HSpacing(0.8), - `HWeight(1,`Left(`ComboBox(`id(`server), `opt(`notify), _("&Installation source"), servers ))), - `HSpacing(1.2) - )), - `HBox( - `HSpacing(0.8), - `TextEntry( `id(`url), `opt(`notify), _("Location"), "" ), - `HSpacing(1.2) - ), - `HBox( - `HSpacing(0.8), - `PushButton( `id(`newserver), _("New Server...") ), - `PushButton( `id(`editserver), _("Edit Server...") ), - `HStretch() - ), - `VSpacing(0.3), - `HBox(`HSpacing(0.8), - `Left(`CheckBox(`id(`manual), - _("&Manually Select Patches"), manualSelection ) ) - ), - `HBox(`HSpacing(0.8), - `Left(`CheckBox(`id(`reload), - _("&Reload All Patches from Server"), false ) ) - ), - `VSpacing( 0.5 ), - `HBox( - `PushButton( `id( `automatic ), - _("&Configure Fully Automatic Update...") ) - ), - `VSpacing( 0.3 ) - ) - ) - ), - `HWeight(1, `Empty()) - ), - `VSpacing( 0.5 ) - ); - - string help_text = ""; - - // helptext dialog online update start screen - string help_part1 = _("YaST Online Update (YOU) is the easy way to get all recommended -patches and security fixes from a SuSE update server. - -"); - - string help_part2 = _(" -If Manually Select Patches is checked, all available patches will be shown -from which to select the patches to install. -If Reload All Patches from Server is checked, all patches will be fetched -from the server even when they already are locally available from a previous -download. - -"); - - string help_part3 = _("After clicking New Server, select a local -installation source instead of an FTP or HTTP server or select -another FTP or HTTP server. Click Edit Server to edit the location of the -selected server. -"); - - string help_part4 = _("Clicking Configure Fully Automatic Update -opens a dialog in which to configure YOU to check for updates once a day -and automatically download and install updates when new ones are available -without the need of user interaction. -"); - - help_text = help_part1 + help_part2 + help_part3 + help_part4; - - Wizard::SetContents( _("Welcome to YaST Online Update"), contents, help_text, - false, true ); - - Wizard::SetNextButton(`next, Label::NextButton() ); - Wizard::DisableBackButton(); - Wizard::EnableAbortButton(); - - UI::ChangeWidget( `id(`server), `Value, 1 ); - - server = you_server_list[ 1 ]:$[]; - UI::ChangeWidget( `id(`url), `Value, server[ "url" ]:"" ); - - - // Loop for User Input .... - - symbol ret = `next; - - repeat { - - ret = (symbol)UI::UserInput(); - - if ( ret == `cancel ) ret = `abort; - - OnlineUpdate::you_auto = !(boolean)UI::QueryWidget( `id( `manual ), - `Value ); - OnlineUpdate::reload = (boolean)UI::QueryWidget( `id( `reload ), `Value ); - - // which server is selected from combo box installation source ? - integer serverId = (integer)UI::QueryWidget(`id(`server), `Value ); - - server = you_server_list[ serverId ]:$[]; - - if ( ret == `server ) { - UI::ChangeWidget( `id(`url), `Value, server[ "url" ]:"" ); - } else if ( ret == `url ) { - if ( serverId != 0 ) { - UI::ChangeWidget( `id(`server), `Value, 0 ); - } - } else if ( ret == `newserver || ret == `editserver ) { - string url = ""; - if ( ret == `editserver ) { - map parsed_url = URL::Parse( (string)UI::QueryWidget( `id(`url), `Value ) ); - parsed_url["user"] = auth["username"]:""; - parsed_url["pass"] = auth["password"]:""; - url = URL::Build(parsed_url); - } - - url = editUrl2( url, true ); - if ( size( url ) > 0 ) { - /* We need to remove user/password from url (#96204) - instead, save it to auth */ - map parsed_url = URL::Parse (url); - auth["username"] = parsed_url["user"]:""; - auth["password"] = parsed_url["pass"]:""; - parsed_url["user"]=""; - parsed_url["pass"]=""; - url = URL::Build(parsed_url); - UI::ChangeWidget( `id(`url), `Value, url ); - UI::ChangeWidget( `id(`server), `Value, 0 ); - auth["url"] = url; - } - } else if ( ret == `automatic ) { - OnlineUpdateDialogs::SetupAutomatic(); - } else if ( ret == `abort && OnlineUpdateDialogs::ConfirmAbortUpdate(`painless) ) { - return `abort; - } else if (ret == `next) { - if ( serverId == 0 ) { - string url = (string)UI::QueryWidget( `id( `url ), `Value ); - if (substring (url, size (url) - 1, 1) != "/") - url = url + "/"; - server[ "url" ] = url; - server[ "type" ] = "custom"; - you_server_list[ 0 ] = server; - } - string err=""; - // Pkg::SetServer( server ) is called in GetPatches() - if ( server["url"]:"" == auth["url"]:"" ) { - y2debug("Using authentication from auth"); - err = GetPatches(server, auth); - } - else { - /* auth is for a different server, don't use it. */ - y2debug("Authentication from different server"); - err = GetPatches(server, $[]); - } - - if ( size( err ) != 0 ) { - y2error( "GetPatches err: %1", err ); - - ret = `this; - - if ( err != "abort" ) { - string msg = ""; - string details = Pkg::LastErrorDetails(); - if ( err == "login" ) { - msg = _("Login failed. Check that you have provided -the correct user name and password. -"); - } else if ( err == "media" ) { - if ( cd_update ) { - msg = _("Initialization failed. Check that -you have inserted the correct CD. -"); - details = Pkg::LastError() + "\n" + details; - } else { - msg = _("Initialization failed. Try again. -If failure continues, choose -another SuSE FTP/HTTP server. -"); - details = Pkg::LastError() + "\n" + details; - } - } else if ( err == "sig" ) { - msg = _("Signature check for patch info files failed. -Cannot load patch information. -"); - ret = `this; - - UI::ChangeWidget( `id( `reload ), `Value, true ); - } else if ( err == "url" ) { - msg = _("URL is invalid."); - } else { - msg = _("Patch information retrieval failed."); - details = err + "\n" + details; - } - - OnlineUpdateDialogs::ErrorPopup( msg, details ); - } - } else { - Pkg::YouSelectPatches(); - } - } else { - y2debug( "RET: %1", ret ); - } - - } until (ret == `back || ret == `next || ret == `again); - - y2debug("Return START: %1", ret ); - - return ret; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/online_update.ycp new/yast2-online-update-2.15.7/src/online_update.ycp --- old/yast2-online-update-2.15.6/src/online_update.ycp 2006-11-08 16:09:35.000000000 +0100 +++ new/yast2-online-update-2.15.7/src/online_update.ycp 2007-03-01 14:10:01.000000000 +0100 @@ -9,6 +9,7 @@ textdomain "online-update"; + import "CommandLine"; import "Confirm"; import "Directory"; import "FileUtils"; @@ -22,36 +23,13 @@ import "Wizard"; import "GetInstArgs"; - integer arg_n = 0; - integer arg_max = size( WFM::Args() ); - - while (arg_n < arg_max ) { - any arg = WFM::Args( arg_n ); - - // start the 'Patch CD Update': add CD as installation source - if ( arg == .cd_default || arg == ".cd_default" ) - { - OnlineUpdate::cd_update = true; - } - else if ( arg == .auto.get || arg == ".auto.get" ) - { - OnlineUpdate::you_auto_get = true; - OnlineUpdate::you_auto = true; - } - arg_n = arg_n + 1; - } + // return value is integer + integer retval = 1; - // only download the patches - OBSOLETE - if ( OnlineUpdate::you_auto ) { - y2warning ("This usage of online_update.ycp is OBSOLETE, use rug instead"); - string command = "rug up -t patch"; - if ( OnlineUpdate::you_auto_get ) { - command = command + " -d"; - } - y2milestone ("command: %1", command ); - integer result = (integer)SCR::Execute( .target.bash, command ); - return result; - } +/** + * Main sequence for Online Update + */ +define symbol OnlineUpdateSequence () { Wizard::CreateDialog(); Wizard::SetDesktopIcon("online_update"); @@ -81,7 +59,7 @@ if (! Confirm::MustBeRoot () || ! PackageLock::Check ()) { Wizard::CloseDialog (); - return 1; + return `cancel; } Progress::NextStage(); @@ -124,7 +102,7 @@ result = WFM::CallFunction( module_name, module_args ); - if ( result == `nil ) return 1; + if ( result == `nil ) return `cancel; if (result == `again ) continue; @@ -153,6 +131,7 @@ Pkg::SourceFinishAll (); } + retval = 0; if (OnlineUpdate::restart_yast) { if (FileUtils::Exists (Directory::vardir + "/selected_patches.ycp")) @@ -160,7 +139,56 @@ Popup::Message (OnlineUpdate::restart_message); } OnlineUpdate::restart_yast = false; - return -42; // restart menu.ycp even if there are no other patches selected + retval = -42;// restart menu.ycp even if there are no other patches selected + } + return `next; +} + + /** + * command line handler for CD update (=> add CD as installation source) + */ + define boolean CDUpdateHandler (map options ) { + OnlineUpdate::cd_update = true; + OnlineUpdateSequence (); + return true; + } + + // the command line description map + map cmdline = $[ + "id" : "online_update", + // translators: command line help text + "help" : _("Online Update module"), + "guihandler" : OnlineUpdateSequence, + "actions" : $[ + "cd_update" :$[ + "handler" : CDUpdateHandler, + // translators: command line help text for pam action + "help" : _("Start Patch CD Update") + ], + ], + "mappings" : $[ + "cd_update" : [] + ] + ]; + + // first check for obsoleted arguments + integer arg_n = 0; + while (arg_n < size (WFM::Args())) { + any arg = WFM::Args( arg_n ); + if ( arg == .cd_default || arg == ".cd_default" ) + { + y2warning (".cd_default parameter is OBSOLETE, use cd_update instead."); + OnlineUpdate::cd_update = true; + } + else if ( arg == .auto.get || arg == ".auto.get" ) + { + y2warning (".auto.get parameter for online_update is OBSOLETE, use zypper or rug instead."); + } + arg_n = arg_n + 1; } - return 0; + if (OnlineUpdate::cd_update) // obsolete .cd_default argument was used + OnlineUpdateSequence (); + else + CommandLine::Run (cmdline); + return retval; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/src/OnlineUpdate.ycp new/yast2-online-update-2.15.7/src/OnlineUpdate.ycp --- old/yast2-online-update-2.15.6/src/OnlineUpdate.ycp 2006-08-22 15:48:49.000000000 +0200 +++ new/yast2-online-update-2.15.7/src/OnlineUpdate.ycp 2007-03-01 14:07:07.000000000 +0100 @@ -18,31 +18,6 @@ // no. of temporary source global integer cd_source = -1; -/** - * flag: YOU automatic get mode? - */ -global boolean you_auto_get = false; - -/** - * flag: Automatic Update - */ -global boolean you_auto = false; - -/** - * Url where patches are looked for. - */ -global string you_url = ""; - -/** - * should signatures be checked? FIXME obsolete - */ -global boolean signature_check = true; - -/** - Force reload of all patches? -*/ -global boolean reload = true; - // if yast should be restarted after installation of patches global boolean restart_yast = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.6/VERSION new/yast2-online-update-2.15.7/VERSION --- old/yast2-online-update-2.15.6/VERSION 2007-02-20 14:22:07.000000000 +0100 +++ new/yast2-online-update-2.15.7/VERSION 2007-03-01 14:08:51.000000000 +0100 @@ -1 +1 @@ -2.15.6 +2.15.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-kerberos-client
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package yast2-kerberos-client checked in at Thu Mar 1 21:36:06 CET 2007. -------- --- yast2-kerberos-client/yast2-kerberos-client.changes 2007-02-20 13:28:39.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-kerberos-client/yast2-kerberos-client.changes 2007-02-27 10:10:31.478659000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 27 09:00:31 CET 2007 - jsuchome(a)suse.cz + +- added option to "Ignore Unknown Principles" (#217369) +- 2.15.4 + +------------------------------------------------------------------- Old: ---- yast2-kerberos-client-2.15.3.tar.bz2 New: ---- yast2-kerberos-client-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kerberos-client.spec ++++++ --- /var/tmp/diff_new_pack.kh4280/_old 2007-03-01 21:35:46.000000000 +0100 +++ /var/tmp/diff_new_pack.kh4280/_new 2007-03-01 21:35:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-kerberos-client (Version 2.15.3) +# spec file for package yast2-kerberos-client (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-kerberos-client -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-kerberos-client-2.15.3.tar.bz2 +Source0: yast2-kerberos-client-2.15.4.tar.bz2 prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API @@ -35,7 +35,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-kerberos-client-2.15.3 +%setup -n yast2-kerberos-client-2.15.4 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,9 @@ %doc %{prefix}/share/doc/packages/yast2-kerberos-client %changelog +* Tue Feb 27 2007 - jsuchome(a)suse.cz +- added option to "Ignore Unknown Principles" (#217369) +- 2.15.4 * Tue Feb 20 2007 - jsuchome(a)suse.cz - support multiple values for KDC (#246241) - 2.15.3 ++++++ yast2-kerberos-client-2.15.3.tar.bz2 -> yast2-kerberos-client-2.15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/agents/etc_krb5_conf.scr new/yast2-kerberos-client-2.15.4/agents/etc_krb5_conf.scr --- old/yast2-kerberos-client-2.15.3/agents/etc_krb5_conf.scr 2007-02-19 16:39:30.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/agents/etc_krb5_conf.scr 2007-02-20 13:29:03.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: * SCR Agent for reading/writing /etc/krb5.conf using the ini-agent * - * $Id: etc_krb5_conf.scr 13007 2003-12-10 13:20:01Z jsuchome $ + * $Id: etc_krb5_conf.scr 36303 2007-02-20 12:29:00Z jsuchome $ * * Read/Sets the values defined in <tt>/etc/krb5.conf</tt>. * Warning! The file has 2 type of sections! diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/src/dialogs.ycp new/yast2-kerberos-client-2.15.4/src/dialogs.ycp --- old/yast2-kerberos-client-2.15.3/src/dialogs.ycp 2007-02-20 13:01:54.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/src/dialogs.ycp 2007-02-23 15:04:34.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 36225 2007-02-16 15:13:34Z jsuchome $ + * $Id: dialogs.ycp 36303 2007-02-20 12:29:00Z jsuchome $ */ { @@ -273,6 +273,9 @@ ") + // help text + _("Check Ignore Unknown Users to have Kerberos ignore authentication attempts by users it does not know.") + + + // help text _("When the Minimum UID is greater than 0, authentication attempts by users with UIDs below the specified number are ignored. This is useful for disabling Kerberos authentication for the system administrator root. @@ -299,11 +302,11 @@ boolean prox = Kerberos::proxiable == "true"; boolean retain = Kerberos::retain_after_close == "true"; boolean ssh = Kerberos::ssh_support; - + boolean ignore_unknown = Kerberos::ignore_unknown; string clockskew = Kerberos::clockskew; term con = `HBox (`HSpacing (3), `VBox ( - `VSpacing (1), + `VSpacing (0.8), // frame label `Frame (_("Ticket Attributes"), `HBox(`HSpacing (0.5), `VBox( `VSpacing (0.5), @@ -320,11 +323,15 @@ `Left(`CheckBox (`id (`retain), _("R&etained"), retain)), `VSpacing (0.5)), `HSpacing (0.5) )), - `VSpacing (1), + `VSpacing (0.8), `Left(`CheckBox (`id (`ssh), // checkbox label _("Kerberos Support for Open&SSH Client"), ssh)), - `VSpacing (0.5), + `VSpacing (0.4), + `Left (`CheckBox (`id (`ignore_unknown), + // checkbox label + _("&Ignore Unknown Users"), ignore_unknown)), + `VSpacing (0.4), // UID=User ID `IntField (`id (`uid), _("Minimum &UID"), 0, 60000, tointeger (uid)), @@ -437,12 +444,17 @@ "true" : "false"; Kerberos::retain_after_close = (boolean) UI::QueryWidget (`id(`retain), `Value) ? "true" : "false"; - if (ssh != Kerberos::ssh_support) { Kerberos::ssh_modified = true; Kerberos::ssh_support = ssh; } + ignore_unknown = (boolean) UI::QueryWidget (`id(`ignore_unknown), `Value); + if (ignore_unknown != Kerberos::ignore_unknown) + { + Kerberos::pam_modified = true; + Kerberos::ignore_unknown = ignore_unknown; + } } return result; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/src/Kerberos.ycp new/yast2-kerberos-client-2.15.4/src/Kerberos.ycp --- old/yast2-kerberos-client-2.15.3/src/Kerberos.ycp 2007-02-20 13:12:39.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/src/Kerberos.ycp 2007-02-27 09:57:35.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of kerberos-client, i/o functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: Kerberos.ycp 35279 2007-01-12 12:38:56Z jsuchome $ + * $Id: Kerberos.ycp 36303 2007-02-20 12:29:00Z jsuchome $ * * Representation of the configuration of kerberos-client. * Input and output routines. @@ -65,6 +65,9 @@ global string use_shmem = "sshd"; global string mappings = ""; +// --krb5-ignore_unknown_principals for pam-config +global boolean ignore_unknown = true; + // section in /etc/ssh/ssh_config file for storing krb support string ssh_section = "*"; @@ -112,6 +115,7 @@ kdc = client["kdc_server"]:""; clockskew = client["clockskew"]:clockskew; ssh_support = client["ssh_support"]:false; + ignore_unknown = client["ignore_unknown"]:ignore_unknown; ticket_lifetime = client["ticket_lifetime"]:"1d"; renew_lifetime = client["renew_lifetime"]:"1d"; minimum_uid = client["minimum_uid"]:minimum_uid; @@ -143,6 +147,7 @@ "kdc_server" : kdc, "clockskew" : clockskew, "ssh_support" : ssh_support, + "ignore_unknown" : ignore_unknown, "ticket_lifetime" : ticket_lifetime, "renew_lifetime" : renew_lifetime, "minimum_uid" : minimum_uid, @@ -251,7 +256,10 @@ */ global define boolean Read () ``{ - use_pam_krb = Pam::Enabled ("krb5"); + map pam_query = Pam::Query ("krb5"); + use_pam_krb = size (pam_query) > 0; + if (use_pam_krb) // if krb is not enabled, ignore_unknown is true by default + ignore_unknown = contains (pam_query["account"]:[], "ignore_unknown_principals"); // now read the settings from /etc/krb5.conf if (FileUtils::Exists ("/etc/krb5.conf")) @@ -395,7 +403,7 @@ list<string> to_install = []; // check if packages are avialable... foreach (string p, packages, ``{ - if (Package::Available (p)) + if (Package::Available (p) == true) to_install = add (to_install, p); }); Package::DoInstallAndRemove (to_install, []); @@ -411,6 +419,10 @@ if (use_pam_krb) { Pam::Add ("krb5"); + if (ignore_unknown) + Pam::Add ("krb5-ignore_unknown_principals"); + else + Pam::Remove ("krb5-ignore_unknown_principals"); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.ycp new/yast2-kerberos-client-2.15.4/testsuite/tests/ReadKrb5ConfValue.ycp --- old/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.ycp 2007-02-20 13:10:50.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/testsuite/tests/ReadKrb5ConfValue.ycp 2007-02-20 13:29:03.000000000 +0100 @@ -2,7 +2,7 @@ * ReadKrb5ConfValue.ycp * Test of Kerberos::ReadKrb5ConfValue function * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: ReadKrb5ConfValue.ycp 21833 2005-02-22 13:51:43Z jsuchome $ + * $Id: ReadKrb5ConfValue.ycp 36303 2007-02-20 12:29:00Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/testsuite/tests/Read.ycp new/yast2-kerberos-client-2.15.4/testsuite/tests/Read.ycp --- old/yast2-kerberos-client-2.15.3/testsuite/tests/Read.ycp 2007-02-20 13:05:47.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/testsuite/tests/Read.ycp 2007-02-20 13:29:03.000000000 +0100 @@ -2,7 +2,7 @@ * Read.ycp * Test of Kerberos::Read function (whole read process, many config files) * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: Read.ycp 32816 2006-09-12 11:49:16Z jsuchome $ + * $Id: Read.ycp 36303 2007-02-20 12:29:00Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.ycp new/yast2-kerberos-client-2.15.4/testsuite/tests/WriteKrb5ConfValue.ycp --- old/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.ycp 2007-02-20 13:15:25.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/testsuite/tests/WriteKrb5ConfValue.ycp 2007-02-20 13:29:03.000000000 +0100 @@ -2,7 +2,7 @@ * WriteKrb5ConfValue.ycp * Test of Kerberos::WriteKrb5ConfValue function * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: WriteKrb5ConfValue.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: WriteKrb5ConfValue.ycp 36303 2007-02-20 12:29:00Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/testsuite/tests/Write.out new/yast2-kerberos-client-2.15.4/testsuite/tests/Write.out --- old/yast2-kerberos-client-2.15.3/testsuite/tests/Write.out 2007-02-20 13:12:06.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/testsuite/tests/Write.out 2007-02-27 09:14:38.000000000 +0100 @@ -1,5 +1,9 @@ Dump ==== writing without any changes ================================= Return true +Dump ==== pam enabled with krb5-ignore_unknown_principals= +Execute .target.bash_output "pam-config -a --krb5" $["stdout":""] +Execute .target.bash_output "pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] +Return true Dump ==== ssh modified (enabled) ====================================== Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes" true Write .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "yes" true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/testsuite/tests/Write.ycp new/yast2-kerberos-client-2.15.4/testsuite/tests/Write.ycp --- old/yast2-kerberos-client-2.15.3/testsuite/tests/Write.ycp 2006-08-25 15:32:04.000000000 +0200 +++ new/yast2-kerberos-client-2.15.4/testsuite/tests/Write.ycp 2007-02-27 09:14:15.000000000 +0100 @@ -51,6 +51,17 @@ Testsuite::Test(``(Kerberos::Write ()), [ $[], WRITE, EX ], 0); + Testsuite::Dump ("==== pam enabled with krb5-ignore_unknown_principals="); + + Kerberos::pam_modified = true; + Kerberos::use_pam_krb = true; + Kerberos::ignore_unknown = true; + + Testsuite::Test(``(Kerberos::Write ()), [ READ, WRITE, EX ], 0); + + Kerberos::pam_modified = false; + Kerberos::ignore_unknown = false; + Testsuite::Dump ("==== ssh modified (enabled) ======================================"); Kerberos::ssh_modified = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.3/VERSION new/yast2-kerberos-client-2.15.4/VERSION --- old/yast2-kerberos-client-2.15.3/VERSION 2007-02-20 13:16:22.000000000 +0100 +++ new/yast2-kerberos-client-2.15.4/VERSION 2007-02-27 09:02:27.000000000 +0100 @@ -1 +1 @@ -2.15.3 +2.15.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit TeXmacs
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package TeXmacs checked in at Thu Mar 1 21:36:02 CET 2007. -------- --- TeXmacs/TeXmacs.changes 2007-02-20 16:13:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/TeXmacs/TeXmacs.changes 2007-02-28 16:36:34.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 28 16:23:18 CET 2007 - mvaner(a)suse.cz + +- Fixing part of 228035 - crash on 64bit computer + - 64bit.patch + - The package is still unuseable, but for other reason now + (Guile version) + +------------------------------------------------------------------- New: ---- TeXmacs-1.0.6.6-64bit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ TeXmacs.spec ++++++ --- /var/tmp/diff_new_pack.HC3998/_old 2007-03-01 21:35:41.000000000 +0100 +++ /var/tmp/diff_new_pack.HC3998/_new 2007-03-01 21:35:41.000000000 +0100 @@ -15,7 +15,7 @@ Summary: A Structured WYSIWYG Scientific Text Editor Group: Productivity/Editors/Other Version: 1.0.6.6 -Release: 27 +Release: 29 License: GNU General Public License (GPL) Requires: tetex guile BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,6 +27,7 @@ Patch8: TeXmacs-random.patch Patch9: TeXmacs-null.patch Patch10: %{name}-%{version}-anim-clip-cond.path +Patch11: %{name}-%{version}-64bit.patch %description GNU TeXmacs is a free scientific text editor, inspired by TeX and GNU @@ -60,12 +61,14 @@ %patch8 %patch9 %patch10 +%patch11 rm -f config.cache %build autoreconf -f -i %configure\ --enable-optimize="$RPM_OPT_FLAGS" +exit 1 make %{?jobs:-j%jobs} %install @@ -118,6 +121,11 @@ %doc %{_mandir}/man?/*.* %changelog +* Wed Feb 28 2007 - mvaner(a)suse.cz +- Fixing part of 228035 - crash on 64bit computer + - 64bit.patch + - The package is still unuseable, but for other reason now + (Guile version) * Tue Feb 20 2007 - mvaner(a)suse.cz - Fixing odd comparison (bug #233326) - anim-clip-cond.path ++++++ TeXmacs-1.0.6.6-64bit.patch ++++++ --- configure.in +++ configure.in @@ -379,7 +379,7 @@ CONFIG_MAX_FAST="260 // WORD_LENGTH more than power of 2" AC_MSG_CHECKING(if we are on a 64-bits computer) -AC_RUN_IFELSE([AC_LANG_PROGRAM([],[exit(sizeof(void*))])], +AC_RUN_IFELSE([AC_LANG_PROGRAM([],[return(sizeof(void*))])], [void_size=0],[void_size=$?]) if test "$void_size" = "8"; then AC_MSG_RESULT([yes]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-iscsi-client
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package yast2-iscsi-client checked in at Thu Mar 1 21:35:40 CET 2007. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2007-02-26 16:07:22.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes 2007-02-28 14:10:19.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 28 14:02:09 CET 2007 - mzugec(a)suse.cz + +- Specified initiatorname not used (#244385) +- 2.14.6 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.14.5.tar.bz2 New: ---- yast2-iscsi-client-2.14.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.O14130/_old 2007-03-01 21:05:33.000000000 +0100 +++ /var/tmp/diff_new_pack.O14130/_new 2007-03-01 21:05:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.14.5) +# spec file for package yast2-iscsi-client (Version 2.14.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-iscsi-client -Version: 2.14.5 +Version: 2.14.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.14.5.tar.bz2 +Source0: yast2-iscsi-client-2.14.6.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-client-2.14.5 +%setup -n yast2-iscsi-client-2.14.6 %build %{prefix}/bin/y2tool y2autoconf @@ -65,6 +65,9 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-client %changelog +* Wed Feb 28 2007 - mzugec(a)suse.cz +- Specified initiatorname not used (#244385) +- 2.14.6 * Mon Feb 26 2007 - mzugec(a)suse.cz - parsing initiatorname.iscsi file fixed (#244767) - 2.14.5 ++++++ yast2-iscsi-client-2.14.5.tar.bz2 -> yast2-iscsi-client-2.14.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.5/configure new/yast2-iscsi-client-2.14.6/configure --- old/yast2-iscsi-client-2.14.5/configure 2007-02-26 16:06:54.000000000 +0100 +++ new/yast2-iscsi-client-2.14.6/configure 2007-02-28 14:08:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-iscsi-client 2.14.4. +# Generated by GNU Autoconf 2.60 for yast2-iscsi-client 2.14.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-iscsi-client' PACKAGE_TARNAME='yast2-iscsi-client' -PACKAGE_VERSION='2.14.4' -PACKAGE_STRING='yast2-iscsi-client 2.14.4' +PACKAGE_VERSION='2.14.6' +PACKAGE_STRING='yast2-iscsi-client 2.14.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-iscsi-client 2.14.4 to adapt to many kinds of systems. +\`configure' configures yast2-iscsi-client 2.14.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-iscsi-client 2.14.4:";; + short | recursive ) echo "Configuration of yast2-iscsi-client 2.14.6:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-iscsi-client configure 2.14.4 +yast2-iscsi-client configure 2.14.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-iscsi-client $as_me 2.14.4, which was +It was created by yast2-iscsi-client $as_me 2.14.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-iscsi-client' - VERSION='2.14.4' + VERSION='2.14.6' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.14.4" +VERSION="2.14.6" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-iscsi-client $as_me 2.14.4, which was +This file was extended by yast2-iscsi-client $as_me 2.14.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-iscsi-client config.status 2.14.4 +yast2-iscsi-client config.status 2.14.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.5/configure.in new/yast2-iscsi-client-2.14.6/configure.in --- old/yast2-iscsi-client-2.14.5/configure.in 2007-02-26 16:06:50.000000000 +0100 +++ new/yast2-iscsi-client-2.14.6/configure.in 2007-02-28 14:08:03.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-client, 2.14.4, http://bugs.opensuse.org/, yast2-iscsi-client) +AC_INIT(yast2-iscsi-client, 2.14.6, http://bugs.opensuse.org/, yast2-iscsi-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.4" +VERSION="2.14.6" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.5/src/IscsiClient.ycp new/yast2-iscsi-client-2.14.6/src/IscsiClient.ycp --- old/yast2-iscsi-client-2.14.5/src/IscsiClient.ycp 2007-02-26 14:39:09.000000000 +0100 +++ new/yast2-iscsi-client-2.14.6/src/IscsiClient.ycp 2007-02-28 14:10:35.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: IscsiClient settings, input and output functions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: IscsiClient.ycp 36488 2007-02-26 13:37:03Z mzugec $ + * $Id: IscsiClient.ycp 36569 2007-02-28 13:08:30Z mzugec $ * * Representation of the configuration of iscsi-client. * Input and output routines. @@ -33,7 +33,7 @@ boolean serviceStatus = false; map<string, any> config = $[]; map<string, any> ibft = nil; - +global string initiatorname = ""; global map<string, any> getiBFT(){ if (ibft==nil){ @@ -263,7 +263,7 @@ // check initiatorname if exist, if no - create it global boolean checkInitiatorName(){ boolean ret=true; - string initiatorname=""; +// string initiatorname=""; string file="/etc/iscsi/initiatorname.iscsi"; string name_from_bios = getiBFT()["iSCSI_INITIATOR_NAME"]:""; y2milestone("Check %1", file); @@ -284,12 +284,12 @@ ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1", initiatorname)); SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]); } else { - string initiatorname=((map<string, any>)SCR::Execute(.target.bash_output, sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; + initiatorname=((map<string, any>)SCR::Execute(.target.bash_output, sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; if (size(name_from_bios)>0 && name_from_bios!=initiatorname){ Popup::Warning( _("InitiatorName from iBFT and from /etc/iscsi/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") ); y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios); SCR::Execute(.target.bash, sformat("mv %1 /etc/iscsi/initiatorname.yastbackup ;echo \"InitiatorName=%2\">%3", file, name_from_bios, file)); - + initiatorname = name_from_bios; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.5/src/widgets.ycp new/yast2-iscsi-client-2.14.6/src/widgets.ycp --- old/yast2-iscsi-client-2.14.5/src/widgets.ycp 2007-02-26 14:38:11.000000000 +0100 +++ new/yast2-iscsi-client-2.14.6/src/widgets.ycp 2007-02-28 13:51:01.000000000 +0100 @@ -4,7 +4,7 @@ boolean stat = false; list<string> curr_rec = []; boolean bg_finish = false; - string initiatorname=""; +// string initiatorname=""; // function for run command in background list <string> runInBg(string command){ bg_finish=false; @@ -173,10 +173,10 @@ } void initInitName(string key){ - initiatorname = ((map<string, any>)SCR::Execute(.target.bash_output, "grep -v '^#' /etc/iscsi/initiatorname.iscsi|grep InitiatorName|cut -d'=' -f2|tr -d '\n'"))["stdout"]:""; +// initiatorname = ((map<string, any>)SCR::Execute(.target.bash_output, "grep -v '^#' /etc/iscsi/initiatorname.iscsi|grep InitiatorName|cut -d'=' -f2|tr -d '\n'"))["stdout"]:""; - y2milestone("initiatorname %1", initiatorname); - UI::ChangeWidget(`initiator_name, `Value, initiatorname); + y2milestone("initiatorname %1", IscsiClient::initiatorname); + UI::ChangeWidget(`initiator_name, `Value, IscsiClient::initiatorname); if (size(IscsiClient::getiBFT()["iSCSI_INITIATOR_NAME"]:"")>0){ UI::ChangeWidget(`initiator_name, `Enabled, false); UI::ChangeWidget(`write, `Enabled, false); @@ -185,11 +185,12 @@ symbol storeInitName (string key, map event){ - if ((string)UI::QueryWidget(`initiator_name, `Value) != initiatorname){ + if ((string)UI::QueryWidget(`initiator_name, `Value) != IscsiClient::initiatorname){ // write initiatorname - initiatorname = (string)UI::QueryWidget(`initiator_name, `Value); - SCR::Execute(.target.bash, sformat("echo \"InitiatorName=%1\">/etc/iscsi/initiatorname.iscsi", initiatorname)); - y2milestone("write initiatorname %1", initiatorname); + IscsiClient::initiatorname = (string)UI::QueryWidget(`initiator_name, `Value); + SCR::Execute(.target.bash, sformat("echo \"InitiatorName=%1\">/etc/iscsi/initiatorname.iscsi", + IscsiClient::initiatorname)); + y2milestone("write initiatorname %1", IscsiClient::initiatorname); } return nil; } @@ -320,7 +321,6 @@ IscsiClient::targets = []; foreach(string row, trg_list, { list<string> tmp_list=splitstring(row, " "); -y2internal("%1:%2 || %3", ip, port, tmp_list); if (issubstring(tmp_list[1]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[1]:"", tmp_list[2]:"")); }); while(!bg_finish){}; @@ -407,12 +407,10 @@ // initialize dialog for all targets from portal (connected/disconnected) void initTargetTable(string key){ -y2internal("curr_rec %1", curr_rec); list <term> items = []; integer row = 0; foreach(string s, IscsiClient::targets, { list<string> row_in_string = splitstring(s, " "); -y2internal("row_in_string %1", row_in_string); items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", (IscsiClient::connected( row_in_string, true ))?_("True"):_("False") )); row = row + 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.5/VERSION new/yast2-iscsi-client-2.14.6/VERSION --- old/yast2-iscsi-client-2.14.5/VERSION 2007-02-26 16:07:53.000000000 +0100 +++ new/yast2-iscsi-client-2.14.6/VERSION 2007-02-28 14:02:07.000000000 +0100 @@ -1 +1 @@ -2.14.5 +2.14.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tightvnc
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package tightvnc checked in at Thu Mar 1 21:35:34 CET 2007. -------- --- tightvnc/tightvnc.changes 2007-02-01 14:32:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/tightvnc/tightvnc.changes 2007-03-01 18:13:11.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 1 18:11:51 CET 2007 - max(a)suse.de + +- Fixed the session manager fix (sic!) in the vncserver script. +- Reverted xinetd fixes that got lost with the last checkin. + (#249810) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tightvnc.spec ++++++ --- /var/tmp/diff_new_pack.z20652/_old 2007-03-01 21:09:01.000000000 +0100 +++ /var/tmp/diff_new_pack.z20652/_new 2007-03-01 21:09:01.000000000 +0100 @@ -22,7 +22,7 @@ PreReq: sed Summary: A virtual X-Window System server Version: 1.3.8 -Release: 1 +Release: 5 Source0: %name-%version.tar.bz2 Source1: vnc_inetd_httpd Source2: vnc.xinetd @@ -110,7 +110,11 @@ %dir /etc/slp.reg.d/ %config(noreplace) /etc/slp.reg.d/* -%changelog -n tightvnc +%changelog +* Thu Mar 01 2007 - max(a)suse.de +- Fixed the session manager fix (sic!) in the vncserver script. +- Reverted xinetd fixes that got lost with the last checkin. + (#249810) * Thu Feb 01 2007 - max(a)suse.de - Added support for the NewFBSize protocol extension (#199702). - Prevent X clients inside an Xvnc session from getting killed by ++++++ vncserver.patch ++++++ --- /var/tmp/diff_new_pack.z20652/_old 2007-03-01 21:09:02.000000000 +0100 +++ /var/tmp/diff_new_pack.z20652/_new 2007-03-01 21:09:02.000000000 +0100 @@ -38,7 +38,7 @@ } $ENV{VNCDESKTOP}= $desktopName; -+delete @ENV{qw(SESSION_MANAGER)} ++delete @ENV{qw(SESSION_MANAGER)}; + system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1 &"); ++++++ vnc.xinetd ++++++ --- tightvnc/vnc.xinetd 2006-08-19 11:32:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/tightvnc/vnc.xinetd 2007-03-01 17:58:18.000000000 +0100 @@ -10,7 +10,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = :42 -inetd -once -query localhost -geometry 1024x768 -depth 16 + server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1024x768 -depth 16 disable = yes } # default: off @@ -25,7 +25,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = :42 -inetd -once -query localhost -geometry 1280x1024 -depth 16 + server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1280x1024 -depth 16 disable = yes } # default: off @@ -40,7 +40,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = :42 -inetd -once -query localhost -geometry 1600x1200 -depth 16 + server_args = -SecurityTypes None -inetd -once -query localhost -geometry 1600x1200 -depth 16 disable = yes } # default: off ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package util-linux checked in at Thu Mar 1 21:08:52 CET 2007. -------- --- util-linux/util-linux.changes 2007-02-12 17:23:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2007-02-27 15:13:54.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 27 10:58:46 CET 2007 - mkoenig(a)suse.de + +- fix missing return code in + util-linux-2.12r-losetup_password.patch +- mount: fix race condition in mount -o loop [#242750] + +------------------------------------------------------------------- New: ---- util-linux-2.12r-mount_racy_loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.Y13789/_old 2007-03-01 21:05:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Y13789/_new 2007-03-01 21:05:33.000000000 +0100 @@ -20,7 +20,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 73 +Release: 76 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2 Source2: nologin.c @@ -110,6 +110,7 @@ Patch109: util-linux-2.12r-losetup_password.patch Patch110: util-linux-2.12r-mkfs_open_exclusive.patch Patch111: util-linux-2.12r-fdisk_remove_bogus_warnings.patch +Patch112: util-linux-2.12r-mount_racy_loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -185,6 +186,7 @@ %patch109 -p1 %patch110 -p1 %patch111 -p1 +%patch112 -p1 # setctsid cp %{S:22} %{S:23} . # nologin and guessfstype @@ -617,7 +619,11 @@ %{_mandir}/man8/tunelp.8.gz %endif -%changelog -n util-linux +%changelog +* Tue Feb 27 2007 - mkoenig(a)suse.de +- fix missing return code in + util-linux-2.12r-losetup_password.patch +- mount: fix race condition in mount -o loop [#242750] * Mon Feb 12 2007 - mkoenig(a)suse.de - remove legacy warnings from fdisk [#241372] * Fri Feb 02 2007 - mkoenig(a)suse.de ++++++ util-linux-2.12r-losetup_password.patch ++++++ --- /var/tmp/diff_new_pack.Y13789/_old 2007-03-01 21:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Y13789/_new 2007-03-01 21:05:37.000000000 +0100 @@ -159,7 +159,15 @@ loopFileName = (char *)file; multiKeyMode = 0; -@@ -848,8 +872,8 @@ set_loop(const char *device, const char +@@ -802,6 +826,7 @@ set_loop(const char *device, const char + } + if ((fd = open(device, mode)) < 0) { + perror (device); ++ ret = 1; + goto close_ffd_return1; + } + *loopro = (mode == O_RDONLY); +@@ -848,8 +873,8 @@ set_loop(const char *device, const char loopinfo.lo_encrypt_key_size = 0; break; case LO_CRYPT_XOR: @@ -170,7 +178,7 @@ xstrncpy (loopinfo.lo_encrypt_key, pass, LO_KEY_SIZE); loopinfo.lo_encrypt_key_size = strlen(loopinfo.lo_encrypt_key); break; -@@ -886,6 +910,7 @@ set_loop(const char *device, const char +@@ -886,6 +911,7 @@ set_loop(const char *device, const char /* This is not compatible with gpgkey= mount option */ if(rd_wr_retry(atoi(passFDnumber), (char *)&loopinfo.lo_encrypt_key[0], LO_KEY_SIZE, 0) < 1) { fprintf(stderr, _("Error: couldn't read binary key\n")); @@ -178,7 +186,7 @@ goto close_fd_ffd_return1; } break; /* out of switch(loopinfo.lo_encrypt_type) */ -@@ -894,6 +919,7 @@ set_loop(const char *device, const char +@@ -894,6 +920,7 @@ set_loop(const char *device, const char /* WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING */ /* IMPORTANT DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA. */ if(loop_create_random_keys((char*)file, *loopro, &multiKeyBits[0][0])) { @@ -186,7 +194,7 @@ goto close_fd_ffd_return1; } memcpy(&loopinfo.lo_encrypt_key[0], &multiKeyBits[0][0], sizeof(loopinfo.lo_encrypt_key)); -@@ -901,8 +927,8 @@ set_loop(const char *device, const char +@@ -901,8 +928,8 @@ set_loop(const char *device, const char break; /* out of switch(loopinfo.lo_encrypt_type) */ } } @@ -197,7 +205,7 @@ i = strlen(pass); if(hashFunc == unhashed1_key_setup) { /* this is for compatibility with historic loop-AES version */ -@@ -966,6 +992,7 @@ set_loop(const char *device, const char +@@ -966,6 +993,7 @@ set_loop(const char *device, const char break; default: fprintf (stderr, _("Error: don't know how to get key for encryption system %d\n"), loopinfo.lo_encrypt_type); @@ -205,7 +213,7 @@ goto close_fd_ffd_return1; } -@@ -985,7 +1012,7 @@ close_fd_ffd_return1: +@@ -985,7 +1013,7 @@ close_fd_ffd_return1: close (fd); close_ffd_return1: close (ffd); @@ -214,6 +222,14 @@ } /* type 18 == LO_CRYPT_CRYPTOAPI */ +@@ -995,6 +1023,7 @@ close_ffd_return1: + fprintf(stderr, _("ioctl: LOOP_SET_STATUS: %s, requested cipher or key length (%d bits) not supported by kernel\n"), strerror(errno), loopinfo.lo_encrypt_key_size << 3); + loop_clr_fd_out: + (void) ioctl (fd, LOOP_CLR_FD, 0); ++ ret = 1; + goto keyclean_close_fd_ffd_return1; + } + } Index: util-linux-2.12r/mount/losetup.8 =================================================================== --- util-linux-2.12r.orig/mount/losetup.8 ++++++ util-linux-2.12r-mount_racy_loop.patch ++++++ Index: util-linux-2.12r/mount/lomount.c =================================================================== --- util-linux-2.12r.orig/mount/lomount.c +++ util-linux-2.12r/mount/lomount.c @@ -1005,7 +1005,17 @@ set_loop(const char *device, const char } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { - perror("ioctl: LOOP_SET_FD"); + switch (errno) { + case EBUSY: + ret = 2; + if (verbose) + perror("ioctl: LOOP_SET_FD"); + break; + default: + ret = 1; + perror("ioctl: LOOP_SET_FD"); + break; + } keyclean_close_fd_ffd_return1: memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key)); memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits)); Index: util-linux-2.12r/mount/mount.c =================================================================== --- util-linux-2.12r.orig/mount/mount.c +++ util-linux-2.12r/mount/mount.c @@ -653,18 +653,32 @@ loop_check(const char **spec, const char printf(_("mount: skipping the setup of a loop device\n")); } else { int loopro = (*flags & MS_RDONLY); + int res; - if (!*loopdev || !**loopdev) - *loopdev = find_unused_loop_device(); - if (!*loopdev) - return EX_SYSERR; /* no more loop devices */ - if (verbose) - printf(_("mount: going to use the loop device %s\n"), *loopdev); - if (set_loop (*loopdev, *loopfile, &loopro, type, AutoChmodPtr)) { + do { + if (!*loopdev || !**loopdev) + *loopdev = find_unused_loop_device(); + if (!*loopdev) + return EX_SYSERR; /* no more loop devices */ if (verbose) - printf(_("mount: failed setting up loop device\n")); - return EX_FAIL; - } + printf(_("mount: going to use the loop device %s\n"), *loopdev); + if (res = set_loop (*loopdev, *loopfile, &loopro, type, AutoChmodPtr)) { + switch(res) { + case 2: + /* loop dev has been grabbed by some other process, + try again */ + if (verbose) + printf("mount: stolen loop=%s ...trying again\n", *loopdev); + *loopdev = NULL; + continue; + default: + if (verbose) + printf(_("mount: failed setting up loop device\n")); + return EX_FAIL; + } + } + } while (!*loopdev); + if (verbose > 1) printf(_("mount: setup loop device successfully\n")); *spec = *loopdev; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-firstboot
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package yast2-firstboot checked in at Thu Mar 1 21:05:23 CET 2007. -------- --- yast2-firstboot/yast2-firstboot.changes 2007-01-05 15:04:37.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-firstboot/yast2-firstboot.changes 2007-02-28 13:41:40.155572000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 28 11:49:25 CET 2007 - lslezak(a)suse.cz + +- Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the + firstboot workflow is aborted (prevent from skipping the + license agreement) (#247552) +- 2.15.1 + +------------------------------------------------------------------- Old: ---- yast2-firstboot-2.15.0.tar.bz2 New: ---- yast2-firstboot-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.d12438/_old 2007-03-01 21:05:02.000000000 +0100 +++ /var/tmp/diff_new_pack.d12438/_new 2007-03-01 21:05:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.15.0) +# spec file for package yast2-firstboot (Version 2.15.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-firstboot URL: http://www.suse.com/ -Version: 2.15.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL), X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.15.0.tar.bz2 +Source0: yast2-firstboot-2.15.1.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml Requires: yast2 @@ -43,7 +43,7 @@ Anas Nashif<nashif(a)suse.de> %prep -%setup -n yast2-firstboot-2.15.0 +%setup -n yast2-firstboot-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -90,7 +90,12 @@ %doc %{prefix}/share/doc/packages/yast2-firstboot /etc/YaST2/*.xml -%changelog -n yast2-firstboot +%changelog +* Wed Feb 28 2007 - lslezak(a)suse.cz +- Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the + firstboot workflow is aborted (prevent from skipping the + license agreement) (#247552) +- 2.15.1 * Fri Jan 05 2007 - jsrain(a)suse.cz - add (by-default disabled) re-creation of SSH keys and setting host name to the firstboot workflow (fate 301246) ++++++ yast2-firstboot-2.15.0.tar.bz2 -> yast2-firstboot-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/configure new/yast2-firstboot-2.15.1/configure --- old/yast2-firstboot-2.15.0/configure 2007-01-05 15:04:10.000000000 +0100 +++ new/yast2-firstboot-2.15.1/configure 2007-02-28 13:40:58.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-firstboot 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-firstboot 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-firstboot 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-firstboot 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1189,7 +1189,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firstboot 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-firstboot 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1260,7 +1260,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.15.0:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.15.1:";; esac cat <<\_ACEOF @@ -1338,7 +1338,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firstboot configure 2.15.0 +yast2-firstboot configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1352,7 +1352,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.15.0, which was +It was created by yast2-firstboot $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2153,7 +2153,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2380,7 +2380,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3385,7 +3385,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firstboot $as_me 2.15.0, which was +This file was extended by yast2-firstboot $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3428,7 +3428,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firstboot config.status 2.15.0 +yast2-firstboot config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/configure.in new/yast2-firstboot-2.15.1/configure.in --- old/yast2-firstboot-2.15.0/configure.in 2007-01-05 15:04:03.000000000 +0100 +++ new/yast2-firstboot-2.15.1/configure.in 2007-02-28 13:40:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.15.0, http://bugs.opensuse.org/, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.15.1, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/firstboot.pot new/yast2-firstboot-2.15.1/firstboot.pot --- old/yast2-firstboot-2.15.0/firstboot.pot 2005-07-29 08:55:27.000000000 +0200 +++ new/yast2-firstboot-2.15.1/firstboot.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-07-29 08:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/Firstboot.ycp:30 -msgid "No Text Available" -msgstr "" - -#: src/firstboot_config.ycp:27 -msgid "Empty" -msgstr "" - -#: src/firstboot_config.ycp:28 -msgid "Enabled" -msgstr "" - -#: src/firstboot_config.ycp:29 -msgid "Disabled" -msgstr "" - -#: src/firstboot_config.ycp:50 -msgid "Help" -msgstr "" - -#: src/firstboot_config.ycp:53 -msgid "First Boot Configuration" -msgstr "" - -#: src/firstboot_config.ycp:55 -msgid "&Up" -msgstr "" - -#: src/firstboot_config.ycp:56 -msgid "D&own" -msgstr "" - -#: src/firstboot_config.ycp:57 -msgid "Enab&le or Disable" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Step" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Label" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Module Name" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Status" -msgstr "" - -#. translators: dialog text -#: src/firstboot_desktop.ycp:73 -msgid "" -"Select the desktop environment \n" -"to use from the list below.\n" -msgstr "" - -#. help text fro desktop dialog -#: src/firstboot_desktop.ycp:89 -msgid "" -"<h3>Desktop Selections</h3>\n" -"This system has more than one desktop environment installed. Select\n" -"the desktop to enable as the default desktop.\n" -msgstr "" - -#. translators: dialog title -#: src/firstboot_desktop.ycp:95 -msgid "Select Your Default Desktop" -msgstr "" - -#: src/firstboot_finish.ycp:42 -msgid "&Start YaST Control Center" -msgstr "" - -#. caption for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:46 -msgid "Configuration Completed" -msgstr "" - -#. congratulation text 1/4 -#: src/firstboot_finish.ycp:49 -msgid "Congratulations!" -msgstr "" - -#. congratulation text 2/4 -#: src/firstboot_finish.ycp:52 -msgid "" -"The installation of &product; on your machine is complete.\n" -"After clicking Finish, you can log in to the system.\n" -msgstr "" - -#. congratulation text 3/4 -#. Translators: If there exists a SuSE web-page for your language -#. change the address accordingly. If in doubt leave the original. -#: src/firstboot_finish.ycp:59 -msgid "Visit us at www.suse.com." -msgstr "" - -#. congratulation text 4/4 -#: src/firstboot_finish.ycp:62 -msgid "Have a lot of fun! Your SuSE Development Team" -msgstr "" - -#. help 1/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:81 -msgid "Your system is ready for use." -msgstr "" - -#. help 2/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:84 -msgid "" -"Finish will close the YaST installation and continue\n" -"to the login screen.\n" -msgstr "" - -#. help 3/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:89 -msgid "" -"If you choose the default graphical desktop KDE, you can\n" -"adjust some KDE settings to your hardware. Also notice\n" -"our SuSE Welcome Dialog.\n" -msgstr "" - -#. help 4/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:97 -msgid "" -"If desired, experts can use the full range of SuSE's configuration\n" -"modules at this time. Check Start YaST Control Center and it will start\n" -"after Finish. Note: The Control Center does not have a back button to\n" -"return to this installation sequence.\n" -msgstr "" - -#. popup text -#: src/firstboot_language.ycp:87 -msgid "" -"Your language setting has been changed.\n" -"\n" -"If necessary, you may want to adapt your keyboard settings to the new\n" -"language. This is possible either in the YaST2 Control Center or by \n" -"starting \"yast2 keyboard\" directly." -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:20 -msgid "Update configuration" -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:22 -msgid "Prepare system for first login" -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:28 -msgid "Updating configuration..." -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:30 -msgid "Preparing system for first login..." -msgstr "" - -#. Help text for last dialog of base installation -#: src/firstboot_write.ycp:35 -msgid "" -"\n" -"Please wait while the system is being configured.\n" -"" -msgstr "" - -#. Headline for last dialog of first boot workflow -#: src/firstboot_write.ycp:44 -msgid "Completing the System Configuration" -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/src/firstboot.ycp new/yast2-firstboot-2.15.1/src/firstboot.ycp --- old/yast2-firstboot-2.15.0/src/firstboot.ycp 2006-06-02 10:57:53.000000000 +0200 +++ new/yast2-firstboot-2.15.1/src/firstboot.ycp 2007-02-28 13:40:40.000000000 +0100 @@ -1,7 +1,7 @@ /** * Maintainer: Jiri Srain <jsrain(a)suse.cz> * - * $Id: firstboot.ycp 31281 2006-06-02 08:57:51Z jsrain $ + * $Id: firstboot.ycp 36560 2007-02-28 12:40:38Z lslezak $ */ { textdomain "firstboot"; @@ -12,6 +12,7 @@ import "Wizard"; import "Report"; import "Firstboot"; + import "Misc"; Wizard::OpenNextBackStepsDialog(); @@ -28,10 +29,39 @@ symbol ret = ProductControl::Run(); + y2milestone("ProductControl::Run() returned: %1", ret); Pkg::SourceFinishAll(); Pkg::TargetFinish(); UI::CloseDialog(); + + // handle abort + if (ret == `abort) + { + // do the same action as if the license has not been accepted + string action = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "halt"); + y2milestone("Firstboot aborted, LICENSE_REFUSAL_ACTION: %1", action); + + if (action == "halt") + { + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + else if (action == "reboot") + { + y2milestone("Rebooting the system..."); + SCR::Execute(.target.bash, "/sbin/reboot"); + } + else if (action == "continue") + { + y2milestone("Finishing Yast..."); + } + else + { + y2error("Unknown action: %1", action); + } + } + return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/VERSION new/yast2-firstboot-2.15.1/VERSION --- old/yast2-firstboot-2.15.0/VERSION 2007-01-05 14:54:19.000000000 +0100 +++ new/yast2-firstboot-2.15.1/VERSION 2007-02-28 11:55:13.000000000 +0100 @@ -1 +1 @@ -2.15.0 +2.15.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0