August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit biosdevname
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package biosdevname checked in at Fri Aug 8 11:48:11 CEST 2008. -------- --- biosdevname/biosdevname.changes 2007-09-22 19:51:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/biosdevname/biosdevname.changes 2008-07-31 15:01:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 13:48:47 CEST 2008 - bwalle(a)suse.de + +- integrate biosdevname to initrd (bnc#403269, FATE#301528) + +------------------------------------------------------------------- Old: ---- biosdevname-0.2.4.tar.gz New: ---- biosdevname-0.2.4.tar.bz2 setup-biosdevname.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ biosdevname.spec ++++++ --- /var/tmp/diff_new_pack.q13447/_old 2008-08-08 11:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.q13447/_new 2008-08-08 11:47:19.000000000 +0200 @@ -2,16 +2,24 @@ # spec file for package biosdevname (Version 0.2.4) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: biosdevname Version: 0.2.4 -Release: 1 +Release: 46 Summary: Udev helper for naming devices per BIOS names Group: System/Base License: GPL v2 only @@ -21,11 +29,14 @@ # breadth-first, or of so, there haven't been any comments about that # on LKML. ExclusiveArch: %{ix86} x86_64 ia64 -Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.gz +Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.bz2 +Source1: setup-biosdevname.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pciutils-devel zlib-devel # to figure out how to name the rules file BuildRequires: udev +# because of mkinitrd_setup in %post and %postun +PreReq: mkinitrd # for ownership of /etc/udev/rules.d Requires: udev @@ -49,10 +60,14 @@ # this is a udev rule, so it needs to live in / rather than /usr %configure --disable-rpath --libdir=/%{_lib} --prefix=/ --bindir=/bin --sbindir=/sbin make %{?_smp_mflags} +cp %{S:1} . %install make install DESTDIR=$RPM_BUILD_ROOT rm %{buildroot}/sbin/%{name}S || : +mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts +install -m 0755 setup-biosdevname.sh \ + $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-biosdevname.sh %clean rm -rf $RPM_BUILD_ROOT @@ -63,18 +78,25 @@ /sbin/%{name} %config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules %{_mandir}/man1/* +/lib/mkinitrd/scripts/setup-biosdevname.sh -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +mkinitrd_setup + +%postun +/sbin/ldconfig +mkinitrd_setup %changelog -* Sat Sep 22 2007 - bwalle(a)suse.de +* Thu Jul 31 2008 bwalle(a)suse.de +- integrate biosdevname to initrd (bnc#403269, FATE#301528) +* Sat Sep 22 2007 bwalle(a)suse.de - update to 0.2.4 o coordinate udev rules usage with udev maintainer o fix crashes in pcmcia search, in_ethernet(), and incorrect command line parsing. -* Mon Sep 03 2007 - bwalle(a)suse.de +* Mon Sep 03 2007 bwalle(a)suse.de - fix crash on startup -* Mon Sep 03 2007 - bwalle(a)suse.de +* Mon Sep 03 2007 bwalle(a)suse.de - initial package for SUSE (209107, FATE 301528) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-profile-manager
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-profile-manager checked in at Fri Aug 8 11:00:57 CEST 2008. -------- --- yast2-profile-manager/yast2-profile-manager.changes 2008-05-16 21:58:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-profile-manager/yast2-profile-manager.changes 2008-08-08 08:53:43.995416000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 8 08:48:16 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398500) +- 2.17.1 + +------------------------------------------------------------------- +Fri Jun 6 15:17:47 CEST 2008 - jsuchome(a)suse.cz + +- do not show back button in main dialog (bnc#390098) +- disable buttons for editing when table is empty +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-profile-manager-2.16.1.tar.bz2 New: ---- yast2-profile-manager-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-profile-manager.spec ++++++ --- /var/tmp/diff_new_pack.Xj8279/_old 2008-08-08 11:00:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Xj8279/_new 2008-08-08 11:00:52.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-profile-manager (Version 2.16.1) +# spec file for package yast2-profile-manager (Version 2.17.1) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-profile-manager -Version: 2.16.1 -Release: 19 +Version: 2.17.1 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-profile-manager-2.16.1.tar.bz2 +Source0: yast2-profile-manager-2.17.1.tar.bz2 Prefix: /usr BuildRequires: doxygen gcc-c++ libxcrypt-devel perl-XML-Writer scpm-devel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite yast2-users Requires: yast2 yast2-users @@ -36,7 +43,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-profile-manager-2.16.1 +%setup -n yast2-profile-manager-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +81,13 @@ %{_libdir}/YaST2/plugin/libpy2ag_scpm.la %doc %{prefix}/share/doc/packages/yast2-profile-manager %changelog +* Fri Aug 08 2008 jsuchome(a)suse.cz +- button labels adapted to current style guide (bnc#398500) +- 2.17.1 +* Fri Jun 06 2008 jsuchome(a)suse.cz +- do not show back button in main dialog (bnc#390098) +- disable buttons for editing when table is empty +- 2.17.0 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-profile-manager-2.16.1.tar.bz2 -> yast2-profile-manager-2.17.1.tar.bz2 ++++++ ++++ 1663 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.16.1/configure.in new/yast2-profile-manager-2.17.1/configure.in --- old/yast2-profile-manager-2.16.1/configure.in 2008-05-16 22:29:51.000000000 +0200 +++ new/yast2-profile-manager-2.17.1/configure.in 2008-08-08 08:49:06.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-profile-manager, 2.16.1, http://bugs.opensuse.org/, yast2-profile-manager) +AC_INIT(yast2-profile-manager, 2.17.1, http://bugs.opensuse.org/, yast2-profile-manager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.1" +VERSION="2.17.1" RPMNAME="yast2-profile-manager" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.16.1/src/complex.ycp new/yast2-profile-manager-2.17.1/src/complex.ycp --- old/yast2-profile-manager-2.16.1/src/complex.ycp 2005-12-07 17:11:23.000000000 +0100 +++ new/yast2-profile-manager-2.17.1/src/complex.ycp 2008-08-08 08:45:55.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: complex.ycp 26456 2005-12-07 16:11:23Z jsuchome $ + * $Id: complex.ycp 48112 2008-06-06 13:21:51Z jsuchome $ */ { @@ -26,9 +26,7 @@ */ define symbol ReadDialog() ``{ Wizard::RestoreHelp(HELPS["read"]:""); - Wizard::DisableAbortButton (); boolean ret = ProfileManager::Read(); - Wizard::EnableAbortButton (); return ret ? `next : `abort; } @@ -38,7 +36,6 @@ */ define symbol WriteDialog() ``{ Wizard::RestoreHelp(HELPS["write"]:""); - Wizard::DisableAbortButton (); boolean ret = ProfileManager::Write(); return ret ? `next : `abort; } @@ -129,8 +126,7 @@ `HSpacing(3)); Wizard::SetContentsButtons (caption, contents, HELPS["main"]:"", - Label::BackButton (), Label::FinishButton ()); - Wizard::RestoreAbortButton (); + Label::CancelButton(), Label::OKButton()); if (ProfileManager::enabled) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.16.1/src/dialogs.ycp new/yast2-profile-manager-2.17.1/src/dialogs.ycp --- old/yast2-profile-manager-2.16.1/src/dialogs.ycp 2007-11-08 22:14:47.000000000 +0100 +++ new/yast2-profile-manager-2.17.1/src/dialogs.ycp 2008-08-08 08:47:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 41896 2007-11-08 21:14:47Z jsuchome $ + * $Id: dialogs.ycp 48112 2008-06-06 13:21:51Z jsuchome $ */ { @@ -531,8 +531,6 @@ Wizard::SetContentsButtons (caption, contents, HELPS["resources"]:"", Label::CancelButton (), Label::OKButton ()); - Wizard::HideAbortButton(); - list items = resource_groups_items(); UI::ChangeWidget(`id(`rgroups), `Items, items); @@ -790,13 +788,15 @@ Wizard::SetContentsButtons (caption, contents, HELPS["users"]:"", Label::CancelButton (), Label::OKButton ()); - Wizard::HideAbortButton(); list items = users_items (); UI::ChangeWidget(`id(`users), `Items, items); if (items != []) UI::SetFocus(`id(`users)); + UI::ChangeWidget(`id (`edit), `Enabled, items != []); + UI::ChangeWidget(`id (`delete), `Enabled, items != []); + while (true) { ret = UI::UserInput (); @@ -812,23 +812,28 @@ if (user != $[]) { users[user["name"]:""] = user["permission"]:""; - UI::ChangeWidget(`id(`users),`Items, users_items()); + items = users_items (); + UI::ChangeWidget(`id(`users),`Items, items); UI::ChangeWidget(`id(`users), `CurrentItem, user["name"]:""); } - continue; } else if (ret == `delete) { - users = remove (users, selected); - UI::ChangeWidget(`id(`users),`Items, users_items()); - continue; + users = remove (users, selected); + items = users_items (); + UI::ChangeWidget (`id (`users), `Items, items); } - else if (ret == `back || + if (ret == `add || ret == `delete) + { + UI::ChangeWidget (`id (`edit), `Enabled, items != []); + UI::ChangeWidget (`id (`delete), `Enabled, items != []); + } + if (ret == `back || (ret == `cancel && Popup::ReallyAbort (ProfileManager::Modified()))) { break; } - else if (ret == `next) + if (ret == `next) { ProfileManager::SetUsers (users); break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.16.1/src/wizards.ycp new/yast2-profile-manager-2.17.1/src/wizards.ycp --- old/yast2-profile-manager-2.16.1/src/wizards.ycp 2005-12-07 17:11:23.000000000 +0100 +++ new/yast2-profile-manager-2.17.1/src/wizards.ycp 2008-08-08 08:45:29.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: wizards.ycp 26456 2005-12-07 16:11:23Z jsuchome $ + * $Id: wizards.ycp 48112 2008-06-06 13:21:51Z jsuchome $ */ { @@ -84,7 +84,8 @@ ] ]; - Wizard::CreateDialog(); + Wizard::OpenNextBackDialog(); + Wizard::HideAbortButton (); Wizard::SetDesktopIcon("profile-manager"); any ret = Sequencer::Run (aliases, sequence); UI::CloseDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.16.1/VERSION new/yast2-profile-manager-2.17.1/VERSION --- old/yast2-profile-manager-2.16.1/VERSION 2008-04-14 11:58:06.000000000 +0200 +++ new/yast2-profile-manager-2.17.1/VERSION 2008-08-08 08:48:46.000000000 +0200 @@ -1 +1 @@ -2.16.1 +2.17.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

commit yast2-online-update
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-online-update checked in at Fri Aug 8 11:00:43 CEST 2008. -------- --- yast2-online-update/yast2-online-update.changes 2008-07-16 10:57:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-online-update/yast2-online-update.changes 2008-08-08 08:59:43.106970000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 8 08:56:09 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (#bnc398480) +- 2.17.4 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.17.3.tar.bz2 New: ---- yast2-online-update-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.aM3987/_old 2008-08-08 11:00:01.000000000 +0200 +++ /var/tmp/diff_new_pack.aM3987/_new 2008-08-08 11:00:01.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-online-update (Version 2.17.3) +# spec file for package yast2-online-update (Version 2.17.4) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-online-update -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.17.3.tar.bz2 +Source0: yast2-online-update-2.17.4.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 @@ -51,7 +58,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-online-update-2.17.3 +%setup -n yast2-online-update-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -156,6 +163,9 @@ /var/lib/YaST2/cd_update.desktop %ghost %{prefix}/share/applications/YaST2/cd_update.desktop %changelog +* Fri Aug 08 2008 jsuchome(a)suse.cz +- button labels adapted to current style guide (#bnc398480) +- 2.17.4 * Tue Jul 08 2008 jsuchome(a)suse.cz - Run online update during autoinstallation (fate#301298) - 2.17.3 ++++++ yast2-online-update-2.17.3.tar.bz2 -> yast2-online-update-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.17.3/src/do_online_update_auto.ycp new/yast2-online-update-2.17.4/src/do_online_update_auto.ycp --- old/yast2-online-update-2.17.3/src/do_online_update_auto.ycp 2008-07-08 12:59:26.000000000 +0200 +++ new/yast2-online-update-2.17.4/src/do_online_update_auto.ycp 2008-07-16 10:55:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Run online update during autoinstallation * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id:$ + * $Id: do_online_update_auto.ycp 49142 2008-07-16 08:57:44Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.17.3/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.17.4/src/OnlineUpdateCallbacks.ycp --- old/yast2-online-update-2.17.3/src/OnlineUpdateCallbacks.ycp 2008-07-07 11:46:02.000000000 +0200 +++ new/yast2-online-update-2.17.4/src/OnlineUpdateCallbacks.ycp 2008-07-23 15:13:48.000000000 +0200 @@ -217,6 +217,8 @@ // progress log item (%1 is name of delta RPM if (last_callback == "StartProvide" || last_callback == "StartDownload") ProgressLog ("\n" + indent); + + // Progress log. Leave the space at the end, some other text may follow ProgressLog (sformat(_("Downloading delta RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { @@ -258,7 +260,8 @@ * callback for start of applying delta rpm */ global void StartDeltaApply (string name) { - // progress log item (%1 is name of delta RPM) + // Progress log item (%1 is name of delta RPM). + // Leave the space at the end, some other text may follow. ProgressLog (indent + sformat(_("Applying delta RPM: %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { @@ -304,6 +307,7 @@ // progress log item (%1 is name of delta RPM) if (last_callback == "StartProvide") ProgressLog ("\n" + indent); + // Progress log; lave the space at the end, some other text may follow. ProgressLog (sformat(_("Downloading patch RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.17.3/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.17.4/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.17.3/src/OnlineUpdateDialogs.ycp 2007-09-14 21:10:15.000000000 +0200 +++ new/yast2-online-update-2.17.4/src/OnlineUpdateDialogs.ycp 2008-08-08 08:56:02.000000000 +0200 @@ -71,7 +71,7 @@ term content = `VBox( `HBox( - `HSpacing( 0.8 ), + `HSpacing (), `Left( `CheckBox( `id( `enable ), `opt( `notify ), // checkbox label @@ -80,7 +80,7 @@ ), `VSpacing( 0.2 ), `HBox( - `HSpacing( 0.8 ), + `HSpacing (), `Left( `Frame( `id( `settings ), "", `VBox( `HBox( @@ -148,10 +148,9 @@ ); term dlg_contents = `HVCenter( content); - Wizard::CreateDialog(); + Wizard::OpenOKDialog (); Wizard::SetDesktopIcon("online_update"); - Wizard::SetContentsButtons(heading, dlg_contents, txt, - Label::BackButton(), Label::FinishButton()); + Wizard::SetContents (heading, dlg_contents, txt, true, true); UI::ChangeWidget( `id( `skipPre ), `Enabled, enabled ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.17.3/VERSION new/yast2-online-update-2.17.4/VERSION --- old/yast2-online-update-2.17.3/VERSION 2008-07-08 13:00:43.000000000 +0200 +++ new/yast2-online-update-2.17.4/VERSION 2008-08-08 08:56:43.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.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 yast2-nfs-client
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-nfs-client checked in at Fri Aug 8 10:59:51 CEST 2008. -------- --- yast2-nfs-client/yast2-nfs-client.changes 2008-08-06 21:23:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2008-08-08 10:37:09.825883000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 8 10:29:55 CEST 2008 - kmachalkova(a)suse.cz + +- Configuration dialog split into two tabs: fstab entries and settings +- Extended list of supported nfs(4) mount options +- 2.17.1 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-2.17.0.tar.bz2 New: ---- yast2-nfs-client-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.fJ3363/_old 2008-08-08 10:59:45.000000000 +0200 +++ /var/tmp/diff_new_pack.fJ3363/_new 2008-08-08 10:59:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-nfs-client (Version 2.17.0) +# spec file for package yast2-nfs-client (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-nfs-client -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-client-2.17.0.tar.bz2 +Source0: yast2-nfs-client-2.17.1.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #Hostname::CurrentDomain @@ -51,7 +51,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-nfs-client-2.17.0 +%setup -n yast2-nfs-client-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,10 @@ %doc %{prefix}/share/doc/packages/yast2-nfs-client /usr/share/YaST2/schema/autoyast/rnc/nfs.rnc %changelog +* Fri Aug 08 2008 kmachalkova(a)suse.cz +- Configuration dialog split into two tabs: fstab entries and settings +- Extended list of supported nfs(4) mount options +- 2.17.1 * Wed Aug 06 2008 kmachalkova(a)suse.cz - Create correct fstab entries when importing data from AY profile (regression from FaTE #302031 - now we need to store also fstype ++++++ yast2-nfs-client-2.17.0.tar.bz2 -> yast2-nfs-client-2.17.1.tar.bz2 ++++++ ++++ 1710 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/configure.in new/yast2-nfs-client-2.17.1/configure.in --- old/yast2-nfs-client-2.17.0/configure.in 2008-04-14 19:16:15.000000000 +0200 +++ new/yast2-nfs-client-2.17.1/configure.in 2008-04-10 17:30:58.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-nfs-client dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-client, 2.16.0, http://bugs.opensuse.org/, yast2-nfs-client) +AC_INIT(yast2-nfs-client, 2.15.0, http://bugs.opensuse.org/, yast2-nfs-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,11 +14,10 @@ AC_PREFIX_DEFAULT(/usr) -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) +AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.0" +VERSION="2.15.0" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -108,7 +107,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) + AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/COPYRIGHT.english new/yast2-nfs-client-2.17.1/COPYRIGHT.english --- old/yast2-nfs-client-2.17.0/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nfs-client-2.17.1/COPYRIGHT.english 2008-08-08 10:35:55.000000000 +0200 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/Makefile.am new/yast2-nfs-client-2.17.1/Makefile.am --- old/yast2-nfs-client-2.17.0/Makefile.am 2008-04-14 19:16:15.000000000 +0200 +++ new/yast2-nfs-client-2.17.1/Makefile.am 2008-04-10 17:30:58.000000000 +0200 @@ -23,14 +23,13 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english 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 instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/src/routines.ycp new/yast2-nfs-client-2.17.1/src/routines.ycp --- old/yast2-nfs-client-2.17.0/src/routines.ycp 2008-04-14 16:25:42.000000000 +0200 +++ new/yast2-nfs-client-2.17.1/src/routines.ycp 2008-08-07 16:28:35.000000000 +0200 @@ -12,7 +12,7 @@ * Jan Holesovsky <kendy(a)suse.cz> * Dan Vesely <dan(a)suse.cz> * - * $Id: routines.ycp 46430 2008-04-11 15:13:42Z kmachalkova $ + * $Id: routines.ycp 49830 2008-08-07 14:28:34Z kmachalkova $ * * Network NFS routines * @@ -141,8 +141,8 @@ //the options must be easy to sync with mount.c and nfsmount.c // these can be negated by "no" - list<string> non_value = ["bg", "fg", "soft", "hard", "intr", "posix", "cto", "ac", - "lock", "tcp", "udp", + list<string> non_value = ["bg", "fg", "soft", "hard", "intr", "posix", "cto", "ac", "acl", + "lock", "tcp", "udp", "rdirplus", // these are common for all fs types "atime", "auto", "dev", "exec", "group", "owner", "suid", "user", "users"]; @@ -152,8 +152,8 @@ "remount", "bind", "rbind", "_netdev", ]; list with_value = ["rsize", "wsize", "timeo", "retrans", "acregmin", "acregmax", "acdirmin", "acdirmin", "acdirmax", "actimeo", "retry", "namlen", - "port", "mountport", "mountport", "mounthost", "mountprog", - "mountvers", "nfsprog", "nfsvers"]; + "port", "proto", "clientaddr", "mountport", "mounthost", + "mountprog", "mountvers", "nfsprog", "nfsvers", "vers", "sec" ]; integer i = 0; string current_option = ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/src/ui.ycp new/yast2-nfs-client-2.17.1/src/ui.ycp --- old/yast2-nfs-client-2.17.0/src/ui.ycp 2008-08-06 15:50:15.000000000 +0200 +++ new/yast2-nfs-client-2.17.1/src/ui.ycp 2008-08-07 16:08:39.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <dan(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 49770 2008-08-06 13:20:53Z kmachalkova $ + * $Id: ui.ycp 49826 2008-08-07 13:56:39Z kmachalkova $ * * Network NFS client dialogs * @@ -441,7 +441,29 @@ list<map<string,any> > nfs_entries = Nfs::nfs_entries; - term contents = + void InitFstabEntries( ) + { + UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); + } + + void InitSettings( ) + { + CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled); + } + + void SaveFstabEntries( map event ) + { + Nfs::nfs_entries = nfs_entries; + } + + void SaveSettings( map event ) + { + CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + } + + term fstab_contents = `VBox( `Table(`id(`fstable), `opt(`notify, `immediate), `header( @@ -462,18 +484,29 @@ `PushButton(`id(`delbut), `opt (`key_F5), Label::DeleteButton ()), // #211570 - `HStretch ()), - `VSpacing (1), - `HBox( - `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))), - `Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain Name"))), - `HStretch() - ), - `VSpacing (1), - fw_cwm_widget["custom_widget"]:`Empty (), - // frame label - `VSpacing(0.2) - ); + `HStretch ()) + ); + term settings_content = + `VBox( + //`VSpacing (1), + `HBox( + `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))), + `Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain Name"))), + `HStretch() + ), + `VSpacing (1), + fw_cwm_widget["custom_widget"]:`Empty (), + `VStretch() + ); + + term contents = + `VBox( + `DumbTab( + [ `item(`id(`overview),_("&NFS Shares")), + `item(`id(`settings), _("NFS &Settings")) ], + `ReplacePoint(`id(`rp), fstab_contents) + ) + ); // dialog heading Wizard::SetContentsButtons(_("NFS Client Configuration"), @@ -482,7 +515,7 @@ Label::FinishButton ()); // initialize the widget (set the current value) - CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + //CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); UI::ChangeWidget (`id(`editbut), `Enabled, false); UI::ChangeWidget (`id(`delbut), `Enabled, false); @@ -491,18 +524,23 @@ map event = nil; any ret = nil; + integer entryno = -1; do { - integer entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); - UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); - UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); - - // Kludge, because a `Table still does not have a shortcut. - // Simple to solve here: there's only the table and buttons, - // so it is OK to always set focus to the table - UI::SetFocus (`id (`fstable)); + if ( UI::WidgetExists(`id(`fstable)) ) + { + entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); + UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); + UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); + + // Kludge, because a `Table still does not have a shortcut. + // Simple to solve here: there's only the table and buttons, + // so it is OK to always set focus to the table + UI::SetFocus (`id (`fstable)); + + } event = UI::WaitForEvent (); ret = event["ID"]:nil; @@ -512,11 +550,13 @@ } // handle the events, enable/disable the button, show the popup if button clicked - CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); - changed = + if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) + CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); + /*changed = true || // TODO: fw changed, #44106 - true; // TODO: nfs changed - entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); + true; // TODO: nfs changed*/ + if ( UI::WidgetExists(`id(`fstable)) ) + entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); if (ret == `newbut) { @@ -557,6 +597,18 @@ boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4), `Value); UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled); } + else if ( ret == `settings ) + { + SaveFstabEntries( event ); + UI::ReplaceWidget(`id(`rp), settings_content); + InitSettings(); + } + else if ( ret == `overview ) + { + SaveSettings( event ); + UI::ReplaceWidget(`id(`rp), fstab_contents); + InitFstabEntries(); + } else if (ret == `abort && changed && !Popup::ReallyAbort (true)) { ret = `again; @@ -567,10 +619,11 @@ if (ret == `next) { // grab current settings, store them to SuSEFirewall:: - CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); + if( UI::WidgetExists(`id(`fstable)) ) + SaveFstabEntries( event ); + if( UI::WidgetExists(`id(`enable_nfs4)) ) + SaveSettings( event ); - Nfs::nfs_entries = nfs_entries; - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); } Wizard::RestoreScreenShotName (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-nfs-client-2.17.0/VERSION new/yast2-nfs-client-2.17.1/VERSION --- old/yast2-nfs-client-2.17.0/VERSION 2008-08-06 21:50:40.000000000 +0200 +++ new/yast2-nfs-client-2.17.1/VERSION 2008-08-08 10:33:00.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.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

commit yast2-live-installer
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-live-installer checked in at Fri Aug 8 10:59:36 CEST 2008. -------- --- yast2-live-installer/yast2-live-installer.changes 2008-05-29 12:00:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-live-installer/yast2-live-installer.changes 2008-08-08 08:27:08.504567000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 07 18:38:07 CEST 2008 - aschnell(a)suse.de + +- adapted to changes in yast2-storage +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-live-installer-2.16.5.tar.bz2 New: ---- yast2-live-installer-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-live-installer.spec ++++++ --- /var/tmp/diff_new_pack.TK2812/_old 2008-08-08 10:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.TK2812/_new 2008-08-08 10:59:31.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-live-installer (Version 2.16.5) +# spec file for package yast2-live-installer (Version 2.17.0) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-live-installer -Version: 2.16.5 +Version: 2.17.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-live-installer-2.16.5.tar.bz2 +Source0: yast2-live-installer-2.17.0.tar.bz2 Prefix: /usr # Internet and InternetDevices Requires: yast2 >= 2.16.6 @@ -38,7 +45,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-live-installer-2.16.5 +%setup -n yast2-live-installer-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +75,9 @@ %{prefix}/share/applications/YaST2/live-installer.desktop %doc %{prefix}/share/doc/packages/yast2-live-installer %changelog +* Thu Aug 07 2008 aschnell(a)suse.de +- adapted to changes in yast2-storage +- 2.17.0 * Thu May 29 2008 jsrain(a)suse.cz - call boot.dmraid start at the beginning of live installation (bnc #394660) ++++++ yast2-live-installer-2.16.5.tar.bz2 -> yast2-live-installer-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/configure new/yast2-live-installer-2.17.0/configure --- old/yast2-live-installer-2.16.5/configure 2008-05-29 12:00:26.000000000 +0200 +++ new/yast2-live-installer-2.17.0/configure 2008-08-08 08:26:29.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-live-installer 2.16.5. +# Generated by GNU Autoconf 2.61 for yast2-live-installer 2.17.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-live-installer' PACKAGE_TARNAME='yast2-live-installer' -PACKAGE_VERSION='2.16.5' -PACKAGE_STRING='yast2-live-installer 2.16.5' +PACKAGE_VERSION='2.17.0' +PACKAGE_STRING='yast2-live-installer 2.17.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,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-live-installer 2.16.5 to adapt to many kinds of systems. +\`configure' configures yast2-live-installer 2.17.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-live-installer 2.16.5:";; + short | recursive ) echo "Configuration of yast2-live-installer 2.17.0:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-live-installer configure 2.16.5 +yast2-live-installer configure 2.17.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,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-live-installer $as_me 2.16.5, which was +It was created by yast2-live-installer $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2-live-installer' - VERSION='2.16.5' + VERSION='2.17.0' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.16.5" +VERSION="2.17.0" RPMNAME="yast2-live-installer" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2957,9 +2957,6 @@ fi -( cd src/control; ln -sf live-install.xml live-install.glade ) -find src/control -name \*.glade | LC_ALL=C sort > POTFILES - ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" cat >confcache <<\_ACEOF @@ -3402,7 +3399,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-live-installer $as_me 2.16.5, which was +This file was extended by yast2-live-installer $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3445,7 +3442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-live-installer config.status 2.16.5 +yast2-live-installer config.status 2.17.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/configure.in new/yast2-live-installer-2.17.0/configure.in --- old/yast2-live-installer-2.16.5/configure.in 2008-05-29 12:00:21.000000000 +0200 +++ new/yast2-live-installer-2.17.0/configure.in 2008-08-08 08:26:26.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-live-installer dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-live-installer, 2.16.5, http://bugs.opensuse.org/, yast2-live-installer) +AC_INIT(yast2-live-installer, 2.17.0, http://bugs.opensuse.org/, yast2-live-installer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.5" +VERSION="2.17.0" RPMNAME="yast2-live-installer" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -160,9 +160,6 @@ fi -( cd src/control; ln -sf live-install.xml live-install.glade ) -find src/control -name \*.glade | LC_ALL=C sort > POTFILES - AC_CONFIG_FILES(Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/configure.in.in new/yast2-live-installer-2.17.0/configure.in.in --- old/yast2-live-installer-2.16.5/configure.in.in 2007-06-29 14:50:19.000000000 +0200 +++ new/yast2-live-installer-2.17.0/configure.in.in 2008-08-08 08:09:03.000000000 +0200 @@ -9,9 +9,5 @@ @YAST2-CHECKS-YCP@ @YAST2-CHECKS-TESTSUITE@ -## Nasty hack: xgettext doesn't work for XML files, so let's symlink it -( cd src/control; ln -sf live-install.xml live-install.glade ) -find src/control -name \*.glade | LC_ALL=C sort > POTFILES - ## and generate the output... @YAST2-OUTPUT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/live-installer.pot new/yast2-live-installer-2.17.0/live-installer.pot --- old/yast2-live-installer-2.16.5/live-installer.pot 2008-05-22 07:11:41.000000000 +0200 +++ new/yast2-live-installer-2.17.0/live-installer.pot 2008-08-04 10:36:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-22 07:11+0200\n" +"POT-Creation-Date: 2008-08-04 10:36+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" @@ -158,7 +158,7 @@ msgstr "" #. continue-cancel popup -#: src/live-installer.ycp:53 +#: src/live-installer.ycp:54 msgid "" "openSUSE installer detected DMRAID array.\n" "It is not supported by the openSUSE live installer.\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/src/live-installer.ycp new/yast2-live-installer-2.17.0/src/live-installer.ycp --- old/yast2-live-installer-2.16.5/src/live-installer.ycp 2008-05-29 11:44:08.000000000 +0200 +++ new/yast2-live-installer-2.17.0/src/live-installer.ycp 2008-08-08 08:07:05.000000000 +0200 @@ -68,7 +68,7 @@ Mode::SetMode ("live_installation"); // Stage::initial is required for most of the modules to behave correctly Stage::Set ("initial"); - Storage::InitLibstorage (); + Storage::InitLibstorage (false); if (!ProductControl::Init()) y2error("control file %1 not found", ProductControl::custom_control_file ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.16.5/VERSION new/yast2-live-installer-2.17.0/VERSION --- old/yast2-live-installer-2.16.5/VERSION 2008-05-29 11:03:03.000000000 +0200 +++ new/yast2-live-installer-2.17.0/VERSION 2008-08-08 08:20:53.000000000 +0200 @@ -1 +1 @@ -2.16.5 +2.17.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-installation
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-installation checked in at Fri Aug 8 10:59:22 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-07-16 09:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-08-08 10:25:58.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Aug 7 16:40:32 CEST 2008 - locilka(a)suse.cz + +- Added new client inst_scenarios to offer main scenarios of the + newly installed system. +- Configuration for inst_scenarios is defined in control file (Only + SLES so far), client added into SLES workflow. +- Extended control file documentation (All FATE #304373). +- 2.17.3 + +------------------------------------------------------------------- +Wed Aug 6 13:54:07 CEST 2008 - locilka(a)suse.cz + +- New control file entry globals->enable_kdump (default value) + (FATE #303893). +- Adjusted control file documentation. + +------------------------------------------------------------------- +Tue Aug 5 11:48:44 CEST 2008 - locilka(a)suse.cz + +- Calling reiplauto client in SLES control file before reboot + (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). + +------------------------------------------------------------------- +Mon Aug 04 16:22:55 CEST 2008 - aschnell(a)suse.de + +- improved text during ssh installation (bnc #411079) + +------------------------------------------------------------------- +Mon Aug 4 10:39:41 CEST 2008 - locilka(a)suse.cz + +- Added kdump proposal to SLES control file (FATE #303893). + +------------------------------------------------------------------- +Thu Jul 24 13:21:14 CEST 2008 - locilka(a)suse.cz + +- Using button label "License Translations..." in complex welcome + dialog (bnc #400616). +- SLES and SLED control files adapted to features added in 11.0. +- Added Automatic Configuration support into SLED (FATE #303396). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.17.2.tar.bz2 New: ---- yast2-installation-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Eq2041/_old 2008-08-08 10:59:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Eq2041/_new 2008-08-08 10:59:11.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-installation (Version 2.17.2) +# spec file for package yast2-installation (Version 2.17.3) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-installation -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.17.2.tar.bz2 +Source0: yast2-installation-2.17.3.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -107,7 +114,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.17.2 +%setup -n yast2-installation-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -173,6 +180,31 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Thu Aug 07 2008 locilka(a)suse.cz +- Added new client inst_scenarios to offer main scenarios of the + newly installed system. +- Configuration for inst_scenarios is defined in control file (Only + SLES so far), client added into SLES workflow. +- Extended control file documentation (All FATE #304373). +- 2.17.3 +* Wed Aug 06 2008 locilka(a)suse.cz +- New control file entry globals->enable_kdump (default value) + (FATE #303893). +- Adjusted control file documentation. +* Tue Aug 05 2008 locilka(a)suse.cz +- Calling reiplauto client in SLES control file before reboot + (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). +* Mon Aug 04 2008 aschnell(a)suse.de +- improved text during ssh installation (bnc #411079) +* Mon Aug 04 2008 locilka(a)suse.cz +- Added kdump proposal to SLES control file (FATE #303893). +* Thu Jul 24 2008 locilka(a)suse.cz +- Using button label "License Translations..." in complex welcome + dialog (bnc #400616). +- SLES and SLED control files adapted to features added in 11.0. +- Added Automatic Configuration support into SLED (FATE #303396). * Tue Jul 15 2008 aschnell(a)suse.de - fixed vnc connect message during installation (bnc #395834) - 2.17.2 ++++++ yast2-installation-2.17.2.tar.bz2 -> yast2-installation-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/configure new/yast2-installation-2.17.3/configure --- old/yast2-installation-2.17.2/configure 2008-07-11 12:46:27.000000000 +0200 +++ new/yast2-installation-2.17.3/configure 2008-08-04 16:40:49.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-installation 2.17.0' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-installation 2.17.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1208,7 +1208,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-installation 2.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1279,7 +1279,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.17.0:";; + short | recursive ) echo "Configuration of yast2-installation 2.17.2:";; esac cat <<\_ACEOF @@ -1357,7 +1357,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.17.0 +yast2-installation configure 2.17.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1371,7 +1371,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-installation $as_me 2.17.0, which was +It was created by yast2-installation $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2192,7 +2192,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.17.0' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2420,7 +2420,7 @@ -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3563,7 +3563,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.17.0, which was +This file was extended by yast2-installation $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3606,7 +3606,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.17.0 +yast2-installation config.status 2.17.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/configure.in new/yast2-installation-2.17.3/configure.in --- old/yast2-installation-2.17.2/configure.in 2008-07-11 12:46:24.000000000 +0200 +++ new/yast2-installation-2.17.3/configure.in 2008-08-04 16:40:46.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.17.0, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.17.2, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.0" +VERSION="2.17.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/control-section.xml new/yast2-installation-2.17.3/control/docs/control-section.xml --- old/yast2-installation-2.17.2/control/docs/control-section.xml 2008-07-15 15:35:06.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/control-section.xml 2008-08-07 17:13:57.000000000 +0200 @@ -393,6 +393,13 @@ <listitem><para>(boolean) <emphasis>rle_offer_rulevel_4</emphasis> - defines whether runlevel 4 should be offered in Runlevel Editor. Defaul value is <emphasis>false</emphasis> if not set.</para></listitem> + +  + <listitem><para>(boolean) <emphasis>enable_kdump</emphasis> - defines whether + kdump is proposed as <emphasis>enabled</emphasis> in installation proposal. + <emphasis>kdump_proposal</emphasis> client call has to be added into + <link linkend="control_proposals">proposal</link> otherwise this variable + does not have any effect.</para></listitem> </itemizedlist> </section> @@ -700,6 +707,66 @@ </itemizedlist> </section> + + <section id="control_software_scenarios"> + <title>System Scenarios</title> + + <para>System scenarios contain definition of dialog <emphasis>inst_scenarios</emphasis> + in the first stage installation. It offeres several base-scenarios but only one of them + can be selected as the selected one.</para> + + <para>Example of configured scenarios:</para> + <programlisting> + + <xi:include href="examples/software_scenarios.xml" parse="text" + xmlns:xi="http://www.w3.org/2001/XInclude"/> + </programlisting> + + <para>System scenarios are defined inside the <emphasis>software</emphasis> section. + Section <emphasis>system_scenarios</emphasis> consists of several + <emphasis>system_scenario</emphasis> definitions. Every single + <emphasis>system_scenario</emphasis> consists of:</para> + + <itemizedlist> + <listitem><para><emphasis>id</emphasis> - unique identificator of + a selection.</para></listitem> + <listitem><para><emphasis>patterns</emphasis> - space-separated list of patterns + covering the software scenario.</para></listitem> + <listitem><para><emphasis>icon</emphasis> - plain icon filename (from 32x32 theme + directory) without suffix.</para></listitem> + </itemizedlist> + + <para>Selection labels must be defined in <link linkend="control_texts">texts</link> section. + Scenarios <emphasis>id</emphasis>s are used as link identificators.</para> + + <programlisting> + + <software> + <system_scenario> + <id><emphasis>scenario_id</emphasis></id> + </system_scenario> + </software> + + <texts> + <<emphasis>scenario_id</emphasis>><label>Some Label</label></<emphasis>scenario_id</emphasis>> + </texts> + + </programlisting> + + <para>Section <emphasis>software</emphasis> also contains optional + <emphasis>default_system_scenario</emphasis> that defines id of the default scenario.</para> + + <para>There are some important texts that has to be defined for the dialog layout</para> + + <itemizedlist> + <listitem><para><emphasis>scenarios_caption</emphasis> - used as a dialog caption + for the Scenarios dialog.</para></listitem> + <listitem><para><emphasis>scenarios_text</emphasis> - used as an informative text + describing the available selections below.</para></listitem> + </itemizedlist> + + </section> + <section id="control_partitioning"> <title>Partitioning</title> <para> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/globals-automatic_configuration.xml new/yast2-installation-2.17.3/control/docs/examples/globals-automatic_configuration.xml --- old/yast2-installation-2.17.2/control/docs/examples/globals-automatic_configuration.xml 2008-07-14 16:17:04.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/globals-automatic_configuration.xml 2008-07-18 18:20:58.000000000 +0200 @@ -1,51 +1,44 @@ -<globals> - ... +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <globals> + +  + <automatic_configuration config:type="list"> + +  + <ac_step> + <text_id>ac_1</text_id> + <type>scripts</type> + <ac_items config:type="list"> + <ac_item>initialization</ac_item> + <ac_item>hostname</ac_item> + <ac_item>netprobe</ac_item> + <ac_item>rpmcopy_secondstage</ac_item> + </ac_items> + <icon>yast-lan</icon> + </ac_step> + + <ac_step> + <text_id>ac_3</text_id> + <type>proposals</type> + <ac_items config:type="list"> + <ac_item>x11</ac_item> + <ac_item>printer</ac_item> + <ac_item>sound</ac_item> + <ac_item>tv</ac_item> + </ac_items> + <icon>yast-hwinfo</icon> + </ac_step> + + </automatic_configuration> + </globals> + + <texts> + +  + <ac_1><label>Initialization...</label><ac_1> + <ac_3><label>Configuring hardware...</label><ac_3> -  - <automatic_configuration config:type="list"> - -  - <ac_step> - <text_id>ac_1</text_id> - <type>scripts</type> - <ac_items config:type="list"> - <ac_item>initialization</ac_item> - <ac_item>hostname</ac_item> - <ac_item>netprobe</ac_item> - <ac_item>rpmcopy_secondstage</ac_item> - </ac_items> - <icon>yast-lan</icon> - </ac_step> - - ... - - <ac_step> - <text_id>ac_3</text_id> - <type>proposals</type> - <ac_items config:type="list"> - <ac_item>x11</ac_item> - <ac_item>printer</ac_item> - <ac_item>sound</ac_item> - <ac_item>tv</ac_item> - </ac_items> - <icon>yast-hwinfo</icon> - </ac_step> - - ... - - </automatic_configuration> - ... -</globals> - -<texts> - - ... - -  - <ac_1><label>Initialization...</label><ac_1> - <ac_3><label>Configuring hardware...</label><ac_3> - - ... - -</texts> \ No newline at end of file + </texts> +</productDefines> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/globals-save_instsys_content.xml new/yast2-installation-2.17.3/control/docs/examples/globals-save_instsys_content.xml --- old/yast2-installation-2.17.2/control/docs/examples/globals-save_instsys_content.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/globals-save_instsys_content.xml 2008-07-18 17:53:35.000000000 +0200 @@ -1,11 +1,9 @@ <globals> - ... - <save_instsys_content config:type="list"> - <save_instsys_item> - <instsys_directory>/root/</instsys_directory> - <system_directory>/root/inst-sys/</system_directory> - </save_instsys_item> - </save_instsys_content> - ... + <save_instsys_content config:type="list"> + <save_instsys_item> + <instsys_directory>/root/</instsys_directory> + <system_directory>/root/inst-sys/</system_directory> + </save_instsys_item> + </save_instsys_content> </globals> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/partitions2.xml new/yast2-installation-2.17.3/control/docs/examples/partitions2.xml --- old/yast2-installation-2.17.2/control/docs/examples/partitions2.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/partitions2.xml 2008-07-18 18:21:09.000000000 +0200 @@ -1,4 +1,5 @@ -<partitioning> + +<partitioning> <use_flexible_partitioning config:type="boolean">true</use_flexible_partitioning> <flexible_partitioning> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/partitions.xml new/yast2-installation-2.17.3/control/docs/examples/partitions.xml --- old/yast2-installation-2.17.2/control/docs/examples/partitions.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/partitions.xml 2008-07-18 18:21:05.000000000 +0200 @@ -1,3 +1,4 @@ + <partitioning> <use_flexible_partitioning config:type="boolean">true</use_flexible_partitioning> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/software_scenarios.xml new/yast2-installation-2.17.3/control/docs/examples/software_scenarios.xml --- old/yast2-installation-2.17.2/control/docs/examples/software_scenarios.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.17.3/control/docs/examples/software_scenarios.xml 2008-08-07 15:50:01.000000000 +0200 @@ -0,0 +1,52 @@ + +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <software> + +  + <system_scenarios config:type="list"> + +  + <system_scenario> +  + <id>scenario_game_server</id> +  + <patterns>game_server-pattern high-load-server</patterns> +  + <icon>yast-system</icon> + </system_scenario> + + <system_scenario> + <id>scenario_web_server</id> + <patterns>web_server-pattern</patterns> + <icon>yast-http-server</icon> + </system_scenario> + + <system_scenario> + <id>scenario_nfs_server</id> + <patterns>nfs_server-pattern</patterns> + <icon>yast-nfs-server</icon> + </system_scenario> + + </system_scenarios> + +  + <default_system_scenario>scenario_nfs_server</default_system_scenario> + + </software> + + <texts> + +  + <scenarios_caption><label>Server Base Scenario</label></scenarios_caption> +  + <scenarios_text><label>SUSE Linux Enterprise Server offers several base scenarios. +Choose the one that matches your server the best.</label></scenarios_text> + +  + <scenario_game_server><label>Game Server</label></scenario_game_server> + <scenario_web_server><label>Web Server</label></scenario_web_server> + <scenario_nfs_server><label>NFS Server</label></scenario_nfs_server> + + </texts> +</productDefines> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/texts.xml new/yast2-installation-2.17.3/control/docs/examples/texts.xml --- old/yast2-installation-2.17.2/control/docs/examples/texts.xml 2008-07-11 11:48:50.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/texts.xml 2008-07-18 17:52:54.000000000 +0200 @@ -8,4 +8,4 @@ <congratulate> <label><p><b>Congratulations!</b></p></label> </congratulate> -</texts> \ No newline at end of file +</texts> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/control/docs/examples/workflow.xml new/yast2-installation-2.17.3/control/docs/examples/workflow.xml --- old/yast2-installation-2.17.2/control/docs/examples/workflow.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.17.3/control/docs/examples/workflow.xml 2008-07-18 18:21:21.000000000 +0200 @@ -50,3 +50,4 @@ </module> </modules> </workflow> + </workflows> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.3/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.17.2/src/clients/inst_complex_welcome.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/inst_complex_welcome.ycp 2008-07-24 13:21:06.000000000 +0200 @@ -109,7 +109,7 @@ )), `VStretch (), // TRANSLATORS: button label - `Right (`PushButton (`id (`show_fulscreen_license), _("&Show License..."))) + `Right (`PushButton (`id (`show_fulscreen_license), _("License &Translations..."))) )) ) ), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_network_setup.ycp new/yast2-installation-2.17.3/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.17.2/src/clients/inst_network_setup.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/inst_network_setup.ycp 2008-08-04 12:58:51.000000000 +0200 @@ -419,7 +419,7 @@ // TRANSLATORS: error message Report::Error (_("IP address cannot be empty.")); return false; - } else if (! IP::Check4 (ip_address)) { + } else if (! IP::Check4 (ip_address) && ! IP::Check6 (ip_address)) { UI::SetFocus (`id ("ip_address")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -451,7 +451,7 @@ // TRANSLATORS: error message Report::Error (_("Gateway IP address cannot be empty.")); return false; - } else if (! IP::Check4 (gateway)) { + } else if (! IP::Check4 (gateway) && ! IP::Check6 (gateway)) { UI::SetFocus (`id ("gateway")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -467,7 +467,7 @@ // TRANSLATORS: error message Report::Error (_("DNS server IP address cannot be empty.")); return false; - } else if (! IP::Check4 (dns_server)) { + } else if (! IP::Check4 (dns_server) && ! IP::Check6 (dns_server)) { UI::SetFocus (`id ("dns_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address @@ -505,7 +505,7 @@ // TRANSLATORS: error message Report::Error (_("Proxy server name or IP address must be set.")); return false; - } else if (! IP::Check4 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { + } else if (! IP::Check4 (proxy_server) && ! IP::Check6 (proxy_server) && ! Hostname::CheckFQ (proxy_server)) { UI::SetFocus (`id ("proxy_server")); Report::Error (sformat ( // TRANSLATORS: Error message, %1 is replaced with invalid IP address diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/inst_scenarios.ycp new/yast2-installation-2.17.3/src/clients/inst_scenarios.ycp --- old/yast2-installation-2.17.2/src/clients/inst_scenarios.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.17.3/src/clients/inst_scenarios.ycp 2008-08-07 15:24:21.000000000 +0200 @@ -0,0 +1,228 @@ +/** + * File: clients/inst_scenarios.ycp + * Package: Installation (First Stage) + * Summary: Server/Desktop Scenarios + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + */ + +{ + // See FATE: #304373: Align installation process to use scenarios for Server in early stage + + textdomain "installation"; + + import "ProductControl"; + import "ProductFeatures"; + import "Wizard"; + import "Icon"; + import "Installation"; + import "Popup"; + import "PackageCallbacks"; + import "Report"; + + boolean test_mode = false; + + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { + y2milestone ("Args: %1", WFM::Args()); + if (WFM::Args(0) == "test") test_mode = true; + } + + // load supported scenarios from control file + list <map <string, string> > system_scenarios = + (list <map <string, string> >) ProductFeatures::GetFeature ("software", "system_scenarios"); + + if (system_scenarios == nil || system_scenarios == []) { + y2error ("Undefined software->system_scenarios"); + return `auto; + } + + /** + * Adjusts UI - selected radio button + */ + void SelectAppropriateRadioButton () { + list <map <string, any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + string selected_id = nil; + + // check all scenarios + foreach (map <string, string> one_scenario, system_scenarios, { + list <string> patterns_required = splitstring (one_scenario["patterns"]:"", " \t"); + + integer matching_patterns = 0; + + foreach (map <string, any> one_pattern, patterns, { + if ( + contains (patterns_required, one_pattern["name"]:"") && + (one_pattern["status"]:`a == `installed || one_pattern["status"]:`a == `selected) + ) { + matching_patterns = matching_patterns + 1; + } + }); + + // there are some matching patterns + // they match required patterns + if (matching_patterns > 0 && matching_patterns >= size (patterns_required)) { + y2milestone ("Matching: %1 (%2)", one_scenario["id"]:"", one_scenario["patterns"]:""); + if (selected_id == nil) { + selected_id = one_scenario["id"]:""; + } else { + y2warning ("Scenario %1 already selected", selected_id); + } + } + }); + + // matching patterns found + if (selected_id != nil) { + UI::ChangeWidget (`id (`scenarios), `CurrentButton, selected_id); + + // using fallback from control file + } else { + string default_selection = ProductFeatures::GetStringFeature ("software", "default_system_scenario"); + + if (default_selection == nil || default_selection == "") { + y2warning ("No default selection defined"); + } else { + y2milestone ("Pre-selecting default selection"); + if (UI::WidgetExists (`id (default_selection))) + UI::ChangeWidget (`id (`scenarios), `CurrentButton, default_selection); + else + y2error ("No such selection: %1", default_selection); + } + } + } + + void SelectPatterns (string chosen_selection) { + y2milestone ("User selected: %1", chosen_selection); + + // neutralize 'the other' patterns selected by application + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" != chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Neutralizing pattern: %1", one_pattern); + // false -- only patterns in `selected stage APPL_HIGH will be neutralized + Pkg::ResolvableNeutral (one_pattern, `pattern, false); + }); + } + }); + + // select newly selected patterns for installation + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" == chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Selecting pattern: %1", one_pattern); + Pkg::ResolvableInstall (one_pattern, `pattern); + }); + } + }); + } + + // adjusting test mode - not used in installation + if (test_mode) { + Wizard::CreateDialog(); + Pkg::TargetInit (Installation::destdir, true); + Pkg::SourceStartManager (true); + // pre-select +// foreach (string one_pattern, splitstring (system_scenarios[0,"patterns"]:"", " \t"), { +// Pkg::ResolvableInstall (one_pattern, `pattern); +// }); + Pkg::PkgSolve (true); + } + + y2milestone ("Supported scenarios: %1", system_scenarios); + + term GetDialogContents () { + term dialog_content = `VBox(); + + foreach (map <string, string> one_scenario, system_scenarios, { + dialog_content = add (dialog_content, `HBox ( + `HWeight ( + 1, + (one_scenario["icon"]:"" == "" ? + `Empty () + : + `HBox (`Image (Icon::IconPath (one_scenario["icon"]:""), ""), `HSpacing (2)) + ) + ), + `HWeight ( + 4, + `Left (`RadioButton ( + `id (one_scenario["id"]:""), + ProductControl::GetTranslatedText (one_scenario["id"]:"") + )) + ) + )); + + dialog_content = add (dialog_content, `VSpacing (0.8)); + }); + + dialog_content = `VBox ( + `Label (ProductControl::GetTranslatedText ("scenarios_text")), + `VSpacing (2), + `HSquash (`Frame ( + // TRANSLATORS: frame label + _("Choose Scenario"), + `RadioButtonGroup ( + `id (`scenarios), + `MarginBox (2, 1.3, dialog_content) + ) + )) + ); + + return dialog_content; + } + + // TRANSLATORS: help text + string dialog_help = _("<p>Select a scenario that matches your needs the best. +Additional software can be selected later in software proposal.</p>"); + + // Adjust dialog + Wizard::SetContents ( + ProductControl::GetTranslatedText ("scenarios_caption"), + GetDialogContents(), + dialog_help, + true, + true + ); + Wizard::SetTitleIcon ("yast-software"); + + SelectAppropriateRadioButton(); + + any user_input = nil; + symbol ret = `auto; + + // Handle user input + while (true) { + user_input = UI::UserInput(); + + if (user_input == `next) { + string chosen_selection = (string) UI::QueryWidget (`id (`scenarios), `CurrentButton); + + if (chosen_selection == nil || chosen_selection == "") { + // TRANSLATORS: pop-up message + Report::Message (_("Choose one scenario, please.")); + } else { + SelectPatterns (chosen_selection); + ret = `next; + break; + } + } else if (user_input == `back) { + ret = `back; + break; + } else if (user_input == `abort || user_input == `cancel) { + if (Popup::ConfirmAbort (`painless)) { + ret = `abort; + break; + } + } else { + y2error ("Unexpected ret: %1", user_input); + } + } + + // test mode - not used in installation + if (test_mode) Wizard::CloseDialog(); + + y2milestone ("Returning: %1", ret); + return ret; +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/switch_scr_finish.ycp new/yast2-installation-2.17.3/src/clients/switch_scr_finish.ycp --- old/yast2-installation-2.17.2/src/clients/switch_scr_finish.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/switch_scr_finish.ycp 2008-08-05 12:30:01.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: switch_scr_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ + * $Id: switch_scr_finish.ycp 49690 2008-08-05 10:30:00Z locilka $ * */ @@ -27,29 +27,13 @@ /** * SCR Switch failed. Reporting error, collecting data. - * bugzilla #201058 + * We don't ask whether to run the debugger, just run it. + * + * bnc #201058, #411832 */ void ErrorDuringSCRSwitch (string chroot_dir) { - // import the library once it is needed - import "Popup"; - - y2error("Cannot switch to SCR '%1'", chroot_dir); - - // Ask users whether they want to debug the problem - if (Popup::YesNoHeadline ( - // popup error headline - _("Installation Error"), - // popup question - _("An error occurred while switching to the installed system -and no recovery is possible. -Run the automatic debugger to find out why it has failed?") - )) { - y2milestone("User decided to debug the current problem"); - - RunSCRSwitchDebugger(chroot_dir); - } else { - y2warning("User decided not to debug the current problem"); - } + y2error("Cannot switch to SCR '%1', running debugger", chroot_dir); + RunSCRSwitchDebugger(chroot_dir); } /* Check arguments */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/clients/yast_inf_finish.ycp new/yast2-installation-2.17.3/src/clients/yast_inf_finish.ycp --- old/yast2-installation-2.17.2/src/clients/yast_inf_finish.ycp 2008-05-30 13:17:29.000000000 +0200 +++ new/yast2-installation-2.17.3/src/clients/yast_inf_finish.ycp 2008-08-05 12:30:01.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: yast_inf_finish.ycp 46858 2008-04-18 14:01:38Z juhliarik $ + * $Id: yast_inf_finish.ycp 49690 2008-08-05 10:30:00Z locilka $ * */ @@ -24,6 +24,10 @@ import "Keyboard"; import "Directory"; import "String"; +/* +import "Arch"; +import "Reipl"; +*/ include "installation/misc.ycp"; @@ -193,19 +197,53 @@ y2milestone ("Printing message about loading kernel via kexec"); SCR::Write (.dev.tty.stderr, _(" -*********************************************************** +************************************************************** Loading installed kernel using kexec. Trying to load installed kernel via kexec instead of rebooting Please, wait. -*********************************************************** +************************************************************** ") ); } } +/* + // FATE #304940: Change YaST2-Module for s390 Disk adaptors from + // hwconfig scheme to udev-scheme + if (Arch::s390 ()) { + boolean different = true; + map <string, any> oldConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = Reipl::ReadState (); + + if (oldConfiguration != nil) { + y2milestone ("Calling Reipl::ModifyReiplWithBootPartition"); + Reipl::ModifyReiplWithBootPartition (newConfiguration); + + map oldCcwMap = (map)oldConfiguration["ccw"]:nil; + map newCcwMap = (map)newConfiguration["ccw"]:nil; + map oldFcpMap = (map)oldConfiguration["fcp"]:nil; + map newFcpMap = (map)newConfiguration["fcp"]:nil; + + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + } + + y2milestone ("Reipl changed: %1", different); + if (different) { + linuxrc["Root"] = "halt"; + } + } +*/ + linuxrc["Language"] = Language::language; linuxrc["Keytable"] = Keyboard::keymap; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/src/include/scr_switch_debugger.ycp new/yast2-installation-2.17.3/src/include/scr_switch_debugger.ycp --- old/yast2-installation-2.17.2/src/include/scr_switch_debugger.ycp 2008-04-17 11:08:36.000000000 +0200 +++ new/yast2-installation-2.17.3/src/include/scr_switch_debugger.ycp 2008-08-05 12:27:38.000000000 +0200 @@ -82,18 +82,24 @@ // UI dialog term SCRSwitchDialog () { - return `MarginBox ( - 1, 1, `VBox ( - `MinWidth (70, - // used for progress - `LogView ( - `id (`log_view), - // log-view label - _("&Checking the Installed System..."), - 18, 500 - ) - ), - `ReplacePoint(`id(`dialog_rp), `Empty()) + return `VBox ( + // heading + `Heading (_("Switching to the Installed System Failed")), + // informative text + `Label (_("Running the debugger...")), + `MarginBox ( + 1, 1, `VBox ( + `MinWidth (70, + // used for progress + `LogView ( + `id (`log_view), + // log-view label + _("&Checking the Installed System..."), + 18, 500 + ) + ), + `ReplacePoint(`id(`dialog_rp), `Empty()) + ) ) ); } @@ -109,6 +115,21 @@ UI::ChangeWidget (`id(`log_view), `LastLine, sformat ("%1 %2\n", test_description, (test_result ? result_ok : result_failed)) ); + + UI::ChangeWidget ( + `id(`log_view), `LastLine, + "\n" + + sformat ( + // TRANSLATORS: an error message + // %1 - link to our bugzilla + // %2 - directory where YaST logs are stored + _("This is worth reporting a bug at %1. +Please, attach also all YaST logs stored in the '%2' directory."), + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + ) + + "\n" + ); } // report just some progress diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/startup/YaST2.ssh new/yast2-installation-2.17.3/startup/YaST2.ssh --- old/yast2-installation-2.17.2/startup/YaST2.ssh 2008-04-17 11:08:38.000000000 +0200 +++ new/yast2-installation-2.17.3/startup/YaST2.ssh 2008-08-05 09:40:53.000000000 +0200 @@ -16,7 +16,7 @@ # : This script is called manually # : # : -# STATUS : $Id: YaST2.ssh 34842 2006-12-07 09:59:53Z locilka $ +# STATUS : $Id: YaST2.ssh 49650 2008-08-04 14:24:55Z aschnell $ #---------------- #======================================== @@ -27,8 +27,8 @@ Continue with booting ... - You can login with the (new?) root password or the - new created user account in a few seconds ... + You can login with the (new) root password or the + newly created user account in a few seconds ... EOF } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.2/VERSION new/yast2-installation-2.17.3/VERSION --- old/yast2-installation-2.17.2/VERSION 2008-07-15 18:29:23.000000000 +0200 +++ new/yast2-installation-2.17.3/VERSION 2008-08-08 10:26:40.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.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 xorg-x11-driver-video-unichrome
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package xorg-x11-driver-video-unichrome checked in at Fri Aug 8 10:59:02 CEST 2008. -------- --- arch/i386/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-04-15 02:39:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-08-08 05:07:59.224706385 +0200 @@ -1,0 +2,11 @@ +Fri Aug 8 05:07:16 CEST 2008 - sndirsch(a)suse.de + +- update to git commit fa90a8f (2008-08-07) + * Port driver to work on top of libpciaccess. + +------------------------------------------------------------------- +Thu Jul 31 14:37:07 CEST 2008 - sndirsch(a)suse.de + +- added missing Prerequires (bnc #413561) + +------------------------------------------------------------------- Old: ---- xf86-video-unichrome-9496fc5.tar.bz2 New: ---- xf86-video-unichrome-fa90a8f.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-unichrome.spec ++++++ --- /var/tmp/diff_new_pack.jd1266/_old 2008-08-08 10:58:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jd1266/_new 2008-08-08 10:58:57.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package xorg-x11-driver-video-unichrome (Version 20080411) +# spec file for package xorg-x11-driver-video-unichrome (Version 20080807) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,12 +41,13 @@ License: X11/MIT Group: System/X11/Servers/XF86_4 AutoReqProv: on -Version: 20080411 +Version: 20080807 Release: 1 Summary: The Unichrome Project +PreReq: /bin/ls /bin/cat bin/rm Requires: xorg-x11-server Provides: xorg-x11-driver-video:%{_libdir}/xorg/modules/drivers/unichrome_drv.so -Source: xf86-video-unichrome-9496fc5.tar.bz2 +Source: xf86-video-unichrome-fa90a8f.tar.bz2 Source1: pci_ids Patch: xf86-video-unichrome.diff Patch1: mandriva2007.diff @@ -189,6 +197,11 @@ %endif %changelog +* Fri Aug 08 2008 sndirsch(a)suse.de +- update to git commit fa90a8f (2008-08-07) + * Port driver to work on top of libpciaccess. +* Thu Jul 31 2008 sndirsch(a)suse.de +- added missing Prerequires (bnc #413561) * Tue Apr 15 2008 sndirsch(a)suse.de - update to git (20080411) * manpage: warn about the danger of option DisableIrq ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 NetworkManager-vpnc
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package NetworkManager-vpnc checked in at Fri Aug 8 10:58:48 CEST 2008. -------- --- NetworkManager-vpnc/NetworkManager-vpnc.changes 2008-05-16 06:52:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-vpnc/NetworkManager-vpnc.changes 2008-08-08 02:53:38.727278000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 8 03:02:37 CEST 2008 - bili(a)suse.de + +- Upgrade to 0.7.0.r3783 for fixing building error. + +------------------------------------------------------------------- Old: ---- NetworkManager-vpnc-0.7.0.r3647.tar.bz2 New: ---- NetworkManager-vpnc-0.7.0.r3783.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.G32609/_old 2008-08-08 10:58:40.000000000 +0200 +++ /var/tmp/diff_new_pack.G32609/_new 2008-08-08 10:58:40.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package NetworkManager-vpnc (Version 0.7.0.r3647) +# spec file for package NetworkManager-vpnc (Version 0.7.0.r3783) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,7 +22,7 @@ BuildRequires: NetworkManager-devel NetworkManager-gnome gconf2-devel gnome-keyring-devel intltool libglade2-devel libgnomeui-devel perl-XML-Parser update-desktop-files ExcludeArch: s390 s390x Summary: NetworkManager VPN Support for vpnc -Version: 0.7.0.r3647 +Version: 0.7.0.r3783 Release: 1 License: GPL v2 or later Group: Productivity/Networking/System @@ -109,6 +116,8 @@ %{_prefix}/lib/%{name} %changelog +* Fri Aug 08 2008 bili(a)suse.de +- Upgrade to 0.7.0.r3783 for fixing building error. * Fri May 16 2008 bili(a)suse.de - Upgrade to 0.7.0.r3647(bnc#372141). * Fri Jan 18 2008 tambet(a)suse.de ++++++ NetworkManager-vpnc-0.7.0.r3647.tar.bz2 -> NetworkManager-vpnc-0.7.0.r3783.tar.bz2 ++++++ ++++ 4424 lines of diff (skipped) ++++++ nm-vpnc-properties.patch ++++++ --- /var/tmp/diff_new_pack.G32609/_old 2008-08-08 10:58:41.000000000 +0200 +++ /var/tmp/diff_new_pack.G32609/_new 2008-08-08 10:58:41.000000000 +0200 @@ -2,10 +2,10 @@ =================================================================== --- NetworkManager-vpnc-0.7.0.orig/properties/Makefile.am +++ NetworkManager-vpnc-0.7.0/properties/Makefile.am -@@ -30,9 +30,6 @@ libnm_vpnc_properties_la_LIBADD = - $(GCONF_LIBS) \ - $(LIBGNOMEUI_LIBS) - +@@ -32,9 +32,6 @@ libnm_vpnc_properties_la_LIBADD = + $(LIBGNOMEUI_LIBS) \ + $(NM_UTILS_LIBS) + -libnm_vpnc_properties_la_LDFLAGS = \ - -avoid-version - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package python checked in at Fri Aug 8 02:47:34 CEST 2008. -------- --- python/python.changes 2008-06-30 15:38:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python.changes 2008-07-30 20:48:02.801634000 +0200 @@ -1,0 +2,11 @@ +Wed Jul 30 20:35:02 CEST 2008 - matejcik(a)suse.cz + +- security fixes for issues mentioned in bnc#406051: + * CVE-2008-2315 - multiple integer overflows in basic types + * CVE-2008-2316 - partial hashing of huge data with hashlib + * CVE-2008-3142 - multiple buffer oveflows in unicode processing + * CVE-2008-3144 - possible integer over/underflow in mysnprintf + * buffer overflows in expandtabs() method (afaik no CVE assigned) +- also mentioned CVE-2008-3143 is already fixed in python 2.5.2 + +------------------------------------------------------------------- New: ---- python-2.5.2-CVE-2008-2315-int-overflows.patch python-2.5.2-CVE-2008-2316-hashlib.patch python-2.5.2-CVE-2008-3142-pymem-resize.patch python-2.5.2-CVE-2008-3144-snprintf-over-underflow.patch python-2.5.2-expandtabs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.Tt6196/_old 2008-08-08 02:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Tt6196/_new 2008-08-08 02:45:00.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package python-doc (Version 2.5.1) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.5.1 -Release: 81 +Release: 91 %define pyver 2.5.2 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.Tt6196/_old 2008-08-08 02:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Tt6196/_new 2008-08-08 02:45:00.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package python (Version 2.5.2) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.5.2 -Release: 31 +Release: 43 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source6: README.SUSE @@ -44,6 +51,11 @@ Patch33: python-2.5.2-from-string-and-size.patch Patch34: python-2.5.2-docdirs.patch Patch35: python-2.5.2-configure.patch +Patch36: python-2.5.2-expandtabs.patch +Patch37: python-2.5.2-CVE-2008-3142-pymem-resize.patch +Patch38: python-2.5.2-CVE-2008-2315-int-overflows.patch +Patch39: python-2.5.2-CVE-2008-2316-hashlib.patch +Patch40: python-2.5.2-CVE-2008-3144-snprintf-over-underflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle @@ -218,6 +230,11 @@ %patch33 -p2 %patch34 %patch35 +%patch36 +%patch37 +%patch38 +%patch39 +%patch40 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf @@ -491,6 +508,14 @@ %{_bindir}/python2 %changelog +* Wed Jul 30 2008 matejcik(a)suse.cz +- security fixes for issues mentioned in bnc#406051: + * CVE-2008-2315 - multiple integer overflows in basic types + * CVE-2008-2316 - partial hashing of huge data with hashlib + * CVE-2008-3142 - multiple buffer oveflows in unicode processing + * CVE-2008-3144 - possible integer over/underflow in mysnprintf + * buffer overflows in expandtabs() method (afaik no CVE assigned) +- also mentioned CVE-2008-3143 is already fixed in python 2.5.2 * Mon Jun 30 2008 schwab(a)suse.de - Work around autoheader bug. * Fri Jun 13 2008 schwab(a)suse.de ++++++ python-2.5.2-CVE-2008-2315-int-overflows.patch ++++++ Index: Objects/unicodeobject.c =================================================================== --- Objects/unicodeobject.c (revision 65261) +++ Objects/unicodeobject.c (working copy) @@ -240,6 +240,11 @@ return unicode_empty; } + /* Ensure we won't overflow the size. */ + if (length > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) { + return (PyUnicodeObject *)PyErr_NoMemory(); + } + /* Unicode freelist & memory allocation */ if (unicode_freelist) { unicode = unicode_freelist; @@ -1095,6 +1100,9 @@ char * out; char * start; + if (cbAllocated / 5 != size) + return PyErr_NoMemory(); + if (size == 0) return PyString_FromStringAndSize(NULL, 0); @@ -1693,8 +1701,9 @@ { PyObject *v; unsigned char *p; + Py_ssize_t nsize, bytesize; #ifdef Py_UNICODE_WIDE - int i, pairs; + Py_ssize_t i, pairs; #else const int pairs = 0; #endif @@ -1717,8 +1726,15 @@ if (s[i] >= 0x10000) pairs++; #endif - v = PyString_FromStringAndSize(NULL, - 2 * (size + pairs + (byteorder == 0))); + /* 2 * (size + pairs + (byteorder == 0)) */ + if (size > PY_SSIZE_T_MAX || + size > PY_SSIZE_T_MAX - pairs - (byteorder == 0)) + return PyErr_NoMemory(); + nsize = (size + pairs + (byteorder == 0)); + bytesize = nsize * 2; + if (bytesize / 2 != nsize) + return PyErr_NoMemory(); + v = PyString_FromStringAndSize(NULL, bytesize); if (v == NULL) return NULL; @@ -2046,6 +2062,11 @@ char *p; static const char *hexdigit = "0123456789abcdef"; +#ifdef Py_UNICODE_WIDE + const Py_ssize_t expandsize = 10; +#else + const Py_ssize_t expandsize = 6; +#endif /* Initial allocation is based on the longest-possible unichr escape. @@ -2061,13 +2082,12 @@ escape. */ + if (size > (PY_SSIZE_T_MAX - 2 - 1) / expandsize) + return PyErr_NoMemory(); + repr = PyString_FromStringAndSize(NULL, 2 -#ifdef Py_UNICODE_WIDE - + 10*size -#else - + 6*size -#endif + + expandsize*size + 1); if (repr == NULL) return NULL; @@ -2320,12 +2340,16 @@ char *q; static const char *hexdigit = "0123456789abcdef"; - #ifdef Py_UNICODE_WIDE - repr = PyString_FromStringAndSize(NULL, 10 * size); + const Py_ssize_t expandsize = 10; #else - repr = PyString_FromStringAndSize(NULL, 6 * size); + const Py_ssize_t expandsize = 6; #endif + + if (size > PY_SSIZE_T_MAX / expandsize) + return PyErr_NoMemory(); + + repr = PyString_FromStringAndSize(NULL, expandsize * size); if (repr == NULL) return NULL; if (size == 0) @@ -4761,6 +4785,11 @@ return self; } + if (left > PY_SSIZE_T_MAX - self->length || + right > PY_SSIZE_T_MAX - (left + self->length)) { + PyErr_SetString(PyExc_OverflowError, "padded string is too long"); + return NULL; + } u = _PyUnicode_New(left + self->length + right); if (u) { if (left) Index: Objects/tupleobject.c =================================================================== --- Objects/tupleobject.c (revision 65261) +++ Objects/tupleobject.c (working copy) @@ -60,11 +60,12 @@ Py_ssize_t nbytes = size * sizeof(PyObject *); /* Check for overflow */ if (nbytes / sizeof(PyObject *) != (size_t)size || - (nbytes += sizeof(PyTupleObject) - sizeof(PyObject *)) - <= 0) + (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *))) { return PyErr_NoMemory(); } + nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); + op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size); if (op == NULL) return NULL; Index: Objects/bufferobject.c =================================================================== --- Objects/bufferobject.c (revision 65261) +++ Objects/bufferobject.c (working copy) @@ -427,6 +427,10 @@ count = 0; if (!get_buf(self, &ptr, &size, ANY_BUFFER)) return NULL; + if (count > PY_SSIZE_T_MAX / size) { + PyErr_SetString(PyExc_MemoryError, "result too large"); + return NULL; + } ob = PyString_FromStringAndSize(NULL, size * count); if ( ob == NULL ) return NULL; Index: Objects/longobject.c =================================================================== --- Objects/longobject.c (revision 65261) +++ Objects/longobject.c (working copy) @@ -70,6 +70,8 @@ PyErr_NoMemory(); return NULL; } + /* XXX(nnorwitz): This can overflow -- + PyObject_NEW_VAR / _PyObject_VAR_SIZE need to detect overflow */ return PyObject_NEW_VAR(PyLongObject, &PyLong_Type, size); } Index: Objects/stringobject.c =================================================================== --- Objects/stringobject.c (revision 65261) +++ Objects/stringobject.c (working copy) @@ -75,6 +75,11 @@ return (PyObject *)op; } + if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) { + PyErr_SetString(PyExc_OverflowError, "string is too large"); + return NULL; + } + /* Inline PyObject_NewVar */ op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size); if (op == NULL) @@ -971,14 +976,24 @@ Py_INCREF(a); return (PyObject *)a; } + /* Check that string sizes are not negative, to prevent an + overflow in cases where we are passed incorrectly-created + strings with negative lengths (due to a bug in other code). + */ size = a->ob_size + b->ob_size; - if (size < 0) { + if (a->ob_size < 0 || b->ob_size < 0 || + a->ob_size > PY_SSIZE_T_MAX - b->ob_size) { PyErr_SetString(PyExc_OverflowError, "strings are too large to concat"); return NULL; } /* Inline PyObject_NewVar */ + if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) { + PyErr_SetString(PyExc_OverflowError, + "strings are too large to concat"); + return NULL; + } op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size); if (op == NULL) return PyErr_NoMemory(); Index: Lib/test/seq_tests.py =================================================================== --- Lib/test/seq_tests.py (revision 65261) +++ Lib/test/seq_tests.py (working copy) @@ -307,11 +307,13 @@ self.assertEqual(id(s), id(s*1)) def test_bigrepeat(self): - x = self.type2test([0]) - x *= 2**16 - self.assertRaises(MemoryError, x.__mul__, 2**16) - if hasattr(x, '__imul__'): - self.assertRaises(MemoryError, x.__imul__, 2**16) + import sys + if sys.maxint <= 2147483647: + x = self.type2test([0]) + x *= 2**16 + self.assertRaises(MemoryError, x.__mul__, 2**16) + if hasattr(x, '__imul__'): + self.assertRaises(MemoryError, x.__imul__, 2**16) def test_subscript(self): a = self.type2test([10, 11]) Index: Lib/test/test_strop.py =================================================================== --- Lib/test/test_strop.py (revision 65261) +++ Lib/test/test_strop.py (working copy) @@ -115,7 +115,26 @@ strop.uppercase strop.whitespace + @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=5) + def test_stropjoin_huge_list(self, size): + a = "A" * size + try: + r = strop.join([a, a], a) + except OverflowError: + pass + else: + self.assertEquals(len(r), len(a) * 3) + @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=1) + def test_stropjoin_huge_tup(self, size): + a = "A" * size + try: + r = strop.join((a, a), a) + except OverflowError: + pass # acceptable on 32-bit + else: + self.assertEquals(len(r), len(a) * 3) + transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377' Index: Lib/test/test_bigmem.py =================================================================== --- Lib/test/test_bigmem.py (revision 65261) +++ Lib/test/test_bigmem.py (working copy) @@ -1,5 +1,5 @@ from test import test_support -from test.test_support import bigmemtest, _1G, _2G +from test.test_support import bigmemtest, _1G, _2G, _4G, precisionbigmemtest import unittest import operator @@ -53,7 +53,23 @@ lpadsize += 1 self.assertEquals(s[lpadsize:-rpadsize], SUBSTR) self.assertEquals(s.strip(), SUBSTR.strip()) - + + @precisionbigmemtest(size=_2G - 1, memuse=1) + def test_center_unicode(self, size): + SUBSTR = u' abc def ghi' + try: + s = SUBSTR.center(size) + except OverflowError: + pass # acceptable on 32-bit + else: + self.assertEquals(len(s), size) + lpadsize = rpadsize = (len(s) - len(SUBSTR)) // 2 + if len(s) % 2: + lpadsize += 1 + self.assertEquals(s[lpadsize:-rpadsize], SUBSTR) + self.assertEquals(s.strip(), SUBSTR.strip()) + del s + @bigmemtest(minsize=_2G, memuse=2) def test_count(self, size): SUBSTR = ' abc def ghi' @@ -69,11 +85,45 @@ def test_decode(self, size): s = '.' * size self.assertEquals(len(s.decode('utf-8')), size) + + def basic_encode_test(self, size, enc, c=u'.', expectedsize=None): + if expectedsize is None: + expectedsize = size + + s = c * size + self.assertEquals(len(s.encode(enc)), expectedsize) @bigmemtest(minsize=_2G + 2, memuse=3) def test_encode(self, size): - s = u'.' * size - self.assertEquals(len(s.encode('utf-8')), size) + return self.basic_encode_test(size, 'utf-8') + + @precisionbigmemtest(size=_4G / 6 + 2, memuse=2) + def test_encode_raw_unicode_escape(self, size): + try: + return self.basic_encode_test(size, 'raw_unicode_escape') + except MemoryError: + pass # acceptable on 32-bit + + @precisionbigmemtest(size=_4G / 5 + 70, memuse=3) + def test_encode_utf7(self, size): + try: + return self.basic_encode_test(size, 'utf7') + except MemoryError: + pass # acceptable on 32-bit + + @precisionbigmemtest(size=_2G-1, memuse=2) + def test_decodeascii(self, size): + return self.basic_encode_test(size, 'ascii', c='A') + + @precisionbigmemtest(size=_4G / 5, memuse=6+2) + def test_unicode_repr_oflw(self, size): + try: + s = u"\uAAAA"*size + r = repr(s) + except MemoryError: + pass # acceptable on 32-bit + else: + self.failUnless(s == eval(r)) @bigmemtest(minsize=_2G, memuse=2) def test_endswith(self, size): @@ -458,7 +508,12 @@ self.assertEquals(s[-1], "'") self.assertEquals(s.count('\\'), size) self.assertEquals(s.count('0'), size * 2) - + + @bigmemtest(minsize=2**32 / 5, memuse=6+2) + def test_unicode_repr(self, size): + s = u"\uAAAA" * size + self.failUnless(len(repr(s)) > size) + # This test is meaningful even with size < 2G, as long as the # doubled string is > 2G (but it tests more if both are > 2G :) @bigmemtest(minsize=_1G + 2, memuse=3) @@ -642,6 +697,35 @@ def test_repeat_large(self, size): return self.basic_test_repeat(size) + @bigmemtest(minsize=_1G - 1, memuse=12) + def test_repeat_large_2(self, size): + return self.basic_test_repeat(size) + + @precisionbigmemtest(size=_1G - 1, memuse=9) + def test_from_2G_generator(self, size): + try: + t = tuple(xrange(size)) + except MemoryError: + pass # acceptable on 32-bit + else: + count = 0 + for item in t: + self.assertEquals(item, count) + count += 1 + self.assertEquals(count, size) + + @precisionbigmemtest(size=_1G - 25, memuse=9) + def test_from_almost_2G_generator(self, size): + try: + t = tuple(xrange(size)) + count = 0 + for item in t: + self.assertEquals(item, count) + count += 1 + self.assertEquals(count, size) + except MemoryError: + pass # acceptable, expected on 32-bit + # Like test_concat, split in two. def basic_test_repr(self, size): t = (0,) * size @@ -957,9 +1041,35 @@ self.assertEquals(l[:10], [1] * 10) self.assertEquals(l[-10:], [5] * 10) +class BufferTest(unittest.TestCase): + + @precisionbigmemtest(size=_1G, memuse=4) + def test_repeat(self, size): + try: + b = buffer("AAAA")*size + except MemoryError: + pass # acceptable on 32-bit + else: + count = 0 + for c in b: + self.assertEquals(c, 'A') + count += 1 + self.assertEquals(count, size*4) + def test_main(): - test_support.run_unittest(StrTest, TupleTest, ListTest) + test_support.run_unittest(StrTest, TupleTest, ListTest, BufferTest) +# Expected failures (crashers) +# del StrTest.test_center_unicode +del StrTest.test_decodeascii +# del StrTest.test_encode_utf32 +# del StrTest.test_encode_utf7 +# del StrTest.test_encode_raw_unicode_escape +# +# del TupleTest.test_from_2G_generator +# +# del BufferTest.test_repeat + if __name__ == '__main__': if len(sys.argv) > 1: test_support.set_memlimit(sys.argv[1]) Index: Lib/test/test_support.py =================================================================== --- Lib/test/test_support.py (revision 65261) +++ Lib/test/test_support.py (working copy) @@ -33,6 +33,7 @@ use_resources = None # Flag set to [] by regrtest.py max_memuse = 0 # Disable bigmem tests (they will still be run with # small sizes, to make sure they work.) +real_max_memuse = 0 # _original_stdout is meant to hold stdout at the time regrtest began. # This may be "the real" stdout, or IDLE's emulation of stdout, or whatever. @@ -323,6 +324,7 @@ _1M = 1024*1024 _1G = 1024 * _1M _2G = 2 * _1G +_4G = 4 * _1G # Hack to get at the maximum value an internal index can take. class _Dummy: @@ -333,6 +335,7 @@ def set_memlimit(limit): import re global max_memuse + global real_max_memuse sizes = { 'k': 1024, 'm': _1M, @@ -344,6 +347,7 @@ if m is None: raise ValueError('Invalid memory limit %r' % (limit,)) memlimit = int(float(m.group(1)) * sizes[m.group(3).lower()]) + real_max_memuse = memlimit if memlimit > MAX_Py_ssize_t: memlimit = MAX_Py_ssize_t if memlimit < _2G - 1: @@ -389,6 +393,27 @@ return wrapper return decorator +def precisionbigmemtest(size, memuse, overhead=5*_1M): + def decorator(f): + def wrapper(self): + if not real_max_memuse: + maxsize = 5147 + else: + maxsize = size + + if real_max_memuse and real_max_memuse < maxsize * memuse: + if verbose: + sys.stderr.write("Skipping %s because of memory " + "constraint\n" % (f.__name__,)) + return + + return f(self, maxsize) + wrapper.size = size + wrapper.memuse = memuse + wrapper.overhead = overhead + return wrapper + return decorator + def bigaddrspacetest(f): """Decorator for tests that fill the address space.""" def wrapper(self): Index: Modules/mmapmodule.c =================================================================== --- Modules/mmapmodule.c (revision 65261) +++ Modules/mmapmodule.c (working copy) @@ -223,7 +223,7 @@ return(NULL); /* silently 'adjust' out-of-range requests */ - if ((self->pos + num_bytes) > self->size) { + if (num_bytes > self->size - self->pos) { num_bytes -= (self->pos+num_bytes) - self->size; } result = Py_BuildValue("s#", self->data+self->pos, num_bytes); Index: Modules/stropmodule.c =================================================================== --- Modules/stropmodule.c (revision 65261) +++ Modules/stropmodule.c (working copy) @@ -216,6 +216,13 @@ return NULL; } slen = PyString_GET_SIZE(item); + if (slen > PY_SSIZE_T_MAX - reslen || + seplen > PY_SSIZE_T_MAX - reslen - seplen) { + PyErr_SetString(PyExc_OverflowError, + "input too long"); + Py_DECREF(res); + return NULL; + } while (reslen + slen + seplen >= sz) { if (_PyString_Resize(&res, sz * 2) < 0) return NULL; @@ -253,6 +260,14 @@ return NULL; } slen = PyString_GET_SIZE(item); + if (slen > PY_SSIZE_T_MAX - reslen || + seplen > PY_SSIZE_T_MAX - reslen - seplen) { + PyErr_SetString(PyExc_OverflowError, + "input too long"); + Py_DECREF(res); + Py_XDECREF(item); + return NULL; + } while (reslen + slen + seplen >= sz) { if (_PyString_Resize(&res, sz * 2) < 0) { Py_DECREF(item); Index: Modules/gcmodule.c =================================================================== --- Modules/gcmodule.c (revision 65261) +++ Modules/gcmodule.c (working copy) @@ -1318,7 +1318,10 @@ _PyObject_GC_Malloc(size_t basicsize) { PyObject *op; - PyGC_Head *g = (PyGC_Head *)PyObject_MALLOC( + PyGC_Head *g; + if (basicsize > PY_SSIZE_T_MAX - sizeof(PyGC_Head)) + return PyErr_NoMemory(); + g = (PyGC_Head *)PyObject_MALLOC( sizeof(PyGC_Head) + basicsize); if (g == NULL) return PyErr_NoMemory(); @@ -1361,6 +1364,8 @@ { const size_t basicsize = _PyObject_VAR_SIZE(op->ob_type, nitems); PyGC_Head *g = AS_GC(op); + if (basicsize > PY_SSIZE_T_MAX - sizeof(PyGC_Head)) + return (PyVarObject *)PyErr_NoMemory(); g = (PyGC_Head *)PyObject_REALLOC(g, sizeof(PyGC_Head) + basicsize); if (g == NULL) return (PyVarObject *)PyErr_NoMemory(); ++++++ python-2.5.2-CVE-2008-2316-hashlib.patch ++++++ Index: Lib/test/test_hashlib.py ================================================================================ --- Lib/test/test_hashlib.py +++ Lib/test/test_hashlib.py @@ -9,7 +9,7 @@ import hashlib import unittest from test import test_support - +from test.test_support import _4G, precisionbigmemtest def hexstr(s): import string @@ -55,7 +55,6 @@ m2.update(aas + bees + cees) self.assertEqual(m1.digest(), m2.digest()) - def check(self, name, data, digest): # test the direct constructors computed = getattr(hashlib, name)(data).hexdigest() @@ -74,7 +73,22 @@ def test_case_md5_2(self): self.check('md5', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'd174ab98d277d9f5a5611c2c9f419d9f') - + + @precisionbigmemtest(size=_4G + 5, memuse=1) + def test_case_md5_huge(self, size): + if size == _4G + 5: + try: + self.check('md5', 'A'*size, 'c9af2dff37468ce5dfee8f2cfc0a9c6d') + except OverflowError: + pass # 32-bit arch + + @precisionbigmemtest(size=_4G - 1, memuse=1) + def test_case_md5_uintmax(self, size): + if size == _4G - 1: + try: + self.check('md5', 'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') + except OverflowError: + pass # 32-bit arch # use the three examples from Federal Information Processing Standards # Publication 180-1, Secure Hash Standard, 1995 April 17 --- Modules/_hashopenssl.c +++ Modules/_hashopenssl.c @@ -19,6 +19,8 @@ /* EVP is the preferred interface to hashing in OpenSSL */ #include <openssl/evp.h> +#define MUNCH_SIZE INT_MAX + #ifndef HASH_OBJ_CONSTRUCTOR #define HASH_OBJ_CONSTRUCTOR 0 @@ -164,9 +166,18 @@ if (!PyArg_ParseTuple(args, "s#:update", &cp, &len)) return NULL; + if (len > 0 && len <= MUNCH_SIZE) { EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); - + } else { + Py_ssize_t offset = 0; + while (len) { + unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len; + EVP_DigestUpdate(&self->ctx, cp + offset, process); + len -= process; + offset += process; + } + } Py_INCREF(Py_None); return Py_None; } @@ -255,10 +266,21 @@ self->name = name_obj; Py_INCREF(self->name); - if (cp && len) + if (cp && len) { + if (len > 0 && len <= MUNCH_SIZE) { EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); - + } else { + Py_ssize_t offset = 0; + while (len) { + unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len; + EVP_DigestUpdate(&self->ctx, cp + offset, process); + len -= process; + offset += process; + } + } + } + return 0; } #endif @@ -328,7 +350,7 @@ static PyObject * EVPnew(PyObject *name_obj, const EVP_MD *digest, const EVP_MD_CTX *initial_ctx, - const unsigned char *cp, unsigned int len) + const unsigned char *cp, Py_ssize_t len) { EVPobject *self; @@ -346,8 +368,20 @@ EVP_DigestInit(&self->ctx, digest); } - if (cp && len) - EVP_DigestUpdate(&self->ctx, cp, len); + if (cp && len) { + if (len > 0 && len <= MUNCH_SIZE) { + EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, + unsigned int)); + } else { + Py_ssize_t offset = 0; + while (len) { + unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len; + EVP_DigestUpdate(&self->ctx, cp + offset, process); + len -= process; + offset += process; + } + } + } return (PyObject *)self; } @@ -384,8 +418,7 @@ digest = EVP_get_digestbyname(name); - return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, - unsigned int)); + return EVPnew(name_obj, digest, NULL, cp, len); } /* @@ -410,7 +443,7 @@ CONST_ ## NAME ## _name_obj, \ NULL, \ CONST_new_ ## NAME ## _ctx_p, \ - cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \ + cp, len); \ } /* a PyMethodDef structure for the constructor */ ++++++ python-2.5.2-CVE-2008-3142-pymem-resize.patch ++++++ Index: Include/pymem.h ================================================================================ --- Include/pymem.h +++ Include/pymem.h @@ -67,8 +67,12 @@ for malloc(0), which would be treated as an error. Some platforms would return a pointer with no memory behind it, which would break pymalloc. To solve these problems, allocate an extra byte. */ -#define PyMem_MALLOC(n) malloc((n) ? (n) : 1) -#define PyMem_REALLOC(p, n) realloc((p), (n) ? (n) : 1) +/* Returns NULL to indicate error if a negative size or size larger than + Py_ssize_t can represent is supplied. Helps prevents security holes. */ +#define PyMem_MALLOC(n) (((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \ + : malloc((n) ? (n) : 1)) +#define PyMem_REALLOC(p, n) (((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \ + : realloc((p), (n) ? (n) : 1)) #define PyMem_FREE free #endif /* PYMALLOC_DEBUG */ @@ -77,24 +81,31 @@ * Type-oriented memory interface * ============================== * - * These are carried along for historical reasons. There's rarely a good - * reason to use them anymore (you can just as easily do the multiply and - * cast yourself). + * Allocate memory for n objects of the given type. Returns a new pointer + * or NULL if the request was too large or memory allocation failed. Use + * these macros rather than doing the multiplication yourself so that proper + * overflow checking is always done. */ #define PyMem_New(type, n) \ - ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \ + ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ ( (type *) PyMem_Malloc((n) * sizeof(type)) ) ) #define PyMem_NEW(type, n) \ - ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \ + ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ ( (type *) PyMem_MALLOC((n) * sizeof(type)) ) ) +/* + * The value of (p) is always clobbered by this macro regardless of success. + * The caller MUST check if (p) is NULL afterwards and deal with the memory + * error if so. This means the original value of (p) MUST be saved for the + * caller's memory error handler to not lose track of it. + */ #define PyMem_Resize(p, type, n) \ - ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \ - ( (p) = (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) ) + ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ + (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) #define PyMem_RESIZE(p, type, n) \ - ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \ - ( (p) = (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) ) + ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ + (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) /* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used * anymore. They're just confusing aliases for PyMem_{Free,FREE} now. --- Modules/almodule.c +++ Modules/almodule.c @@ -1633,9 +1633,11 @@ if (nvals < 0) goto cleanup; if (nvals > setsize) { + ALvalue *old_return_set = return_set; setsize = nvals; PyMem_RESIZE(return_set, ALvalue, setsize); if (return_set == NULL) { + return_set = old_return_set; PyErr_NoMemory(); goto cleanup; } --- Modules/arraymodule.c +++ Modules/arraymodule.c @@ -816,6 +816,7 @@ array_do_extend(arrayobject *self, PyObject *bb) { Py_ssize_t size; + char *old_item; if (!array_Check(bb)) return array_iter_extend(self, bb); @@ -831,8 +832,10 @@ return -1; } size = self->ob_size + b->ob_size; + old_item = self->ob_item; PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize); if (self->ob_item == NULL) { + self->ob_item = old_item; PyObject_Del(self); PyErr_NoMemory(); return -1; @@ -886,7 +889,7 @@ if (size > PY_SSIZE_T_MAX / n) { return PyErr_NoMemory(); } - PyMem_Resize(items, char, n * size); + PyMem_RESIZE(items, char, n * size); if (items == NULL) return PyErr_NoMemory(); p = items; --- Modules/selectmodule.c +++ Modules/selectmodule.c @@ -349,10 +349,12 @@ { Py_ssize_t i, pos; PyObject *key, *value; + struct pollfd *old_ufds = self->ufds; self->ufd_len = PyDict_Size(self->dict); - PyMem_Resize(self->ufds, struct pollfd, self->ufd_len); + PyMem_RESIZE(self->ufds, struct pollfd, self->ufd_len); if (self->ufds == NULL) { + self->ufds = old_ufds; PyErr_NoMemory(); return 0; } --- Objects/obmalloc.c +++ Objects/obmalloc.c @@ -727,6 +727,15 @@ uint size; /* + * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes. + * Most python internals blindly use a signed Py_ssize_t to track + * things without checking for overflows or negatives. + * As size_t is unsigned, checking for nbytes < 0 is not required. + */ + if (nbytes > PY_SSIZE_T_MAX) + return NULL; + + /* * This implicitly redirects malloc(0). */ if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) { @@ -1130,6 +1139,15 @@ if (p == NULL) return PyObject_Malloc(nbytes); + /* + * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes. + * Most python internals blindly use a signed Py_ssize_t to track + * things without checking for overflows or negatives. + * As size_t is unsigned, checking for nbytes < 0 is not required. + */ + if (nbytes > PY_SSIZE_T_MAX) + return NULL; + pool = POOL_ADDR(p); if (Py_ADDRESS_IN_RANGE(p, pool)) { /* We're in charge of this block */ ++++++ python-2.5.2-CVE-2008-3144-snprintf-over-underflow.patch ++++++ Index: Python/mysnprintf.c =================================================================== --- Python/mysnprintf.c (revision 63882) +++ Python/mysnprintf.c (revision 63883) @@ -54,18 +54,28 @@ PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) { int len; /* # bytes written, excluding \0 */ -#ifndef HAVE_SNPRINTF +#ifdef HAVE_SNPRINTF +#define _PyOS_vsnprintf_EXTRA_SPACE 1 +#else +#define _PyOS_vsnprintf_EXTRA_SPACE 512 char *buffer; #endif assert(str != NULL); assert(size > 0); assert(format != NULL); + /* We take a size_t as input but return an int. Sanity check + * our input so that it won't cause an overflow in the + * vsnprintf return value or the buffer malloc size. */ + if (size > INT_MAX - _PyOS_vsnprintf_EXTRA_SPACE) { + len = -666; + goto Done; + } #ifdef HAVE_SNPRINTF len = vsnprintf(str, size, format, va); #else /* Emulate it. */ - buffer = PyMem_MALLOC(size + 512); + buffer = PyMem_MALLOC(size + _PyOS_vsnprintf_EXTRA_SPACE); if (buffer == NULL) { len = -666; goto Done; @@ -75,7 +85,7 @@ if (len < 0) /* ignore the error */; - else if ((size_t)len >= size + 512) + else if ((size_t)len >= size + _PyOS_vsnprintf_EXTRA_SPACE) Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf"); else { @@ -86,8 +96,10 @@ str[to_copy] = '\0'; } PyMem_FREE(buffer); +#endif Done: -#endif - str[size-1] = '\0'; + if (size > 0) + str[size-1] = '\0'; return len; +#undef _PyOS_vsnprintf_EXTRA_SPACE } ++++++ python-2.5.2-expandtabs.patch ++++++ Index: Objects/unicodeobject.c =================================================================== --- Objects/unicodeobject.c (revision 61348) +++ Objects/unicodeobject.c (revision 61349) @@ -5689,7 +5689,8 @@ Py_UNICODE *e; Py_UNICODE *p; Py_UNICODE *q; - Py_ssize_t i, j, old_j; + Py_UNICODE *qe; + Py_ssize_t i, j, incr; PyUnicodeObject *u; int tabsize = 8; @@ -5697,63 +5698,70 @@ return NULL; /* First pass: determine size of output string */ - i = j = old_j = 0; - e = self->str + self->length; + i = 0; /* chars up to and including most recent \n or \r */ + j = 0; /* chars since most recent \n or \r (use in tab calculations) */ + e = self->str + self->length; /* end of input */ for (p = self->str; p < e; p++) if (*p == '\t') { if (tabsize > 0) { - j += tabsize - (j % tabsize); - if (old_j > j) { - PyErr_SetString(PyExc_OverflowError, - "new string is too long"); - return NULL; - } - old_j = j; - } + incr = tabsize - (j % tabsize); /* cannot overflow */ + if (j > PY_SSIZE_T_MAX - incr) + goto overflow1; + j += incr; + } } else { + if (j > PY_SSIZE_T_MAX - 1) + goto overflow1; j++; if (*p == '\n' || *p == '\r') { + if (i > PY_SSIZE_T_MAX - j) + goto overflow1; i += j; - old_j = j = 0; - if (i < 0) { - PyErr_SetString(PyExc_OverflowError, - "new string is too long"); - return NULL; - } + j = 0; } } - if ((i + j) < 0) { - PyErr_SetString(PyExc_OverflowError, "new string is too long"); - return NULL; - } + if (i > PY_SSIZE_T_MAX - j) + goto overflow1; /* Second pass: create output string and fill it */ u = _PyUnicode_New(i + j); if (!u) return NULL; - j = 0; - q = u->str; + j = 0; /* same as in first pass */ + q = u->str; /* next output char */ + qe = u->str + u->length; /* end of output */ for (p = self->str; p < e; p++) if (*p == '\t') { if (tabsize > 0) { i = tabsize - (j % tabsize); j += i; - while (i--) + while (i--) { + if (q >= qe) + goto overflow2; *q++ = ' '; + } } } else { + if (q >= qe) + goto overflow2; + *q++ = *p; j++; - *q++ = *p; if (*p == '\n' || *p == '\r') j = 0; } return (PyObject*) u; + + overflow2: + Py_DECREF(u); + overflow1: + PyErr_SetString(PyExc_OverflowError, "new string is too long"); + return NULL; } PyDoc_STRVAR(find__doc__, Index: Objects/stringobject.c =================================================================== --- Objects/stringobject.c (revision 61348) +++ Objects/stringobject.c (revision 61349) @@ -3299,9 +3299,9 @@ static PyObject* string_expandtabs(PyStringObject *self, PyObject *args) { - const char *e, *p; + const char *e, *p, *qe; char *q; - Py_ssize_t i, j, old_j; + Py_ssize_t i, j, incr; PyObject *u; int tabsize = 8; @@ -3309,63 +3309,70 @@ return NULL; /* First pass: determine size of output string */ - i = j = old_j = 0; - e = PyString_AS_STRING(self) + PyString_GET_SIZE(self); + i = 0; /* chars up to and including most recent \n or \r */ + j = 0; /* chars since most recent \n or \r (use in tab calculations) */ + e = PyString_AS_STRING(self) + PyString_GET_SIZE(self); /* end of input */ for (p = PyString_AS_STRING(self); p < e; p++) if (*p == '\t') { if (tabsize > 0) { - j += tabsize - (j % tabsize); - if (old_j > j) { - PyErr_SetString(PyExc_OverflowError, - "new string is too long"); - return NULL; - } - old_j = j; + incr = tabsize - (j % tabsize); + if (j > PY_SSIZE_T_MAX - incr) + goto overflow1; + j += incr; } } else { + if (j > PY_SSIZE_T_MAX - 1) + goto overflow1; j++; if (*p == '\n' || *p == '\r') { + if (i > PY_SSIZE_T_MAX - j) + goto overflow1; i += j; - old_j = j = 0; - if (i < 0) { - PyErr_SetString(PyExc_OverflowError, - "new string is too long"); - return NULL; - } + j = 0; } } - if ((i + j) < 0) { - PyErr_SetString(PyExc_OverflowError, "new string is too long"); - return NULL; - } + if (i > PY_SSIZE_T_MAX - j) + goto overflow1; /* Second pass: create output string and fill it */ u = PyString_FromStringAndSize(NULL, i + j); if (!u) return NULL; - j = 0; - q = PyString_AS_STRING(u); + j = 0; /* same as in first pass */ + q = PyString_AS_STRING(u); /* next output char */ + qe = PyString_AS_STRING(u) + PyString_GET_SIZE(u); /* end of output */ for (p = PyString_AS_STRING(self); p < e; p++) if (*p == '\t') { if (tabsize > 0) { i = tabsize - (j % tabsize); j += i; - while (i--) + while (i--) { + if (q >= qe) + goto overflow2; *q++ = ' '; + } } } else { + if (q >= qe) + goto overflow2; + *q++ = *p; j++; - *q++ = *p; if (*p == '\n' || *p == '\r') j = 0; } return u; + + overflow2: + Py_DECREF(u); + overflow1: + PyErr_SetString(PyExc_OverflowError, "new string is too long"); + return NULL; } Py_LOCAL_INLINE(PyObject *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-irda
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-irda checked in at Fri Aug 8 02:21:13 CEST 2008. -------- --- yast2-irda/yast2-irda.changes 2008-04-15 13:49:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-irda/yast2-irda.changes 2008-08-07 16:27:55.795870000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 7 16:24:19 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398482) +- 2.17.0 + +------------------------------------------------------------------- +Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz + +- added categories Settings and System into desktop file + (bnc #382778) + +------------------------------------------------------------------- Old: ---- yast2-irda-2.16.1.tar.bz2 New: ---- yast2-irda-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-irda.spec ++++++ --- /var/tmp/diff_new_pack.c18940/_old 2008-08-08 02:20:19.000000000 +0200 +++ /var/tmp/diff_new_pack.c18940/_new 2008-08-08 02:20:19.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-irda (Version 2.16.1) +# spec file for package yast2-irda (Version 2.17.0) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-irda -Version: 2.16.1 +Version: 2.17.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-irda-2.16.1.tar.bz2 +Source0: yast2-irda-2.17.0.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -35,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-irda-2.16.1 +%setup -n yast2-irda-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +75,12 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-irda %changelog +* Thu Aug 07 2008 jsuchome(a)suse.cz +- button labels adapted to current style guide (bnc#398482) +- 2.17.0 +* Fri May 16 2008 jsrain(a)suse.cz +- added categories Settings and System into desktop file + (bnc #382778) * Tue Apr 15 2008 jsuchome(a)suse.cz - added label to expert discovery logview widget (bnc#371173) - 2.16.1 ++++++ yast2-irda-2.16.1.tar.bz2 -> yast2-irda-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-irda-2.16.1/src/irda.desktop new/yast2-irda-2.17.0/src/irda.desktop --- old/yast2-irda-2.16.1/src/irda.desktop 2008-03-19 08:53:30.000000000 +0100 +++ new/yast2-irda-2.17.0/src/irda.desktop 2008-05-19 08:01:24.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-irda-2.16.1/src/ui.ycp new/yast2-irda-2.17.0/src/ui.ycp --- old/yast2-irda-2.16.1/src/ui.ycp 2008-04-15 13:45:51.000000000 +0200 +++ new/yast2-irda-2.17.0/src/ui.ycp 2008-08-07 16:24:01.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: ui.ycp 34997 2006-12-20 14:31:34Z jsuchome $ + * $Id: ui.ycp 46661 2008-04-15 11:49:52Z jsuchome $ */ { @@ -81,7 +81,7 @@ // Wait text label `Label(_("Initializing -- please wait...")), `VSpacing(1), - `PushButton(`id(`done), `opt(`default), Label::AbortButton()), + `PushButton(`id(`done), `opt(`default), Label::CancelButton()), `VSpacing(1)), `HSpacing(1.5) )); @@ -253,8 +253,7 @@ ), `HSpacing(3)); - Wizard::SetContentsButtons (caption, con, help, - Label::BackButton (), Label::FinishButton()); + Wizard::SetContents (caption, con, help, true, true); UI::ChangeWidget (`id(`ports), `Value, port); @@ -342,7 +341,7 @@ */ define symbol IrDASequence () { - Wizard::CreateDialog(); + Wizard::OpenOKDialog (); Wizard::SetDesktopIcon("irda"); Irda::Read (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-irda-2.16.1/VERSION new/yast2-irda-2.17.0/VERSION --- old/yast2-irda-2.16.1/VERSION 2008-04-15 13:46:43.000000000 +0200 +++ new/yast2-irda-2.17.0/VERSION 2008-08-07 16:24:59.000000000 +0200 @@ -1 +1 @@ -2.16.1 +2.17.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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