Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon Aug 8 15:02:48 CEST 2011.
-------- --- yast2/yast2.changes 2011-08-03 11:06:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-08-08 13:25:12.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Aug 8 11:07:38 UTC 2011 - [email protected] + +- improved GPG key import dialog: changed "Import" button to + "Trust" (bnc#694213), display expiration warning for expired + keys, better layout for displaying GPG key properties, hide + additional help text in ncurses UI (so the GPG key properties are + displayed completely) +- 2.21.11 + +------------------------------------------------------------------- +Fri Aug 5 12:35:57 CEST 2011 - [email protected] + +- fixed .desktop file (bnc #681249) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.21.10.tar.bz2 New: ---- yast2-2.21.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.fpAqHd/_old 2011-08-08 15:02:08.000000000 +0200 +++ /var/tmp/diff_new_pack.fpAqHd/_new 2011-08-08 15:02:08.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.21.10 +Version: 2.21.11 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.10.tar.bz2 +Source0: yast2-2.21.11.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.21.10 +%setup -n yast2-2.21.11 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.21.10.tar.bz2 -> yast2-2.21.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/VERSION new/yast2-2.21.11/VERSION --- old/yast2-2.21.10/VERSION 2011-08-03 11:04:49.000000000 +0200 +++ new/yast2-2.21.11/VERSION 2011-08-08 13:23:47.000000000 +0200 @@ -1 +1 @@ -2.21.10 +2.21.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/configure new/yast2-2.21.11/configure --- old/yast2-2.21.10/configure 2011-08-03 11:04:59.000000000 +0200 +++ new/yast2-2.21.11/configure 2011-08-08 13:24:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2 2.21.10. +# Generated by GNU Autoconf 2.68 for yast2 2.21.11. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.21.10' -PACKAGE_STRING='yast2 2.21.10' +PACKAGE_VERSION='2.21.11' +PACKAGE_STRING='yast2 2.21.11' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1232,7 +1232,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 2.21.10 to adapt to many kinds of systems. +\`configure' configures yast2 2.21.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.21.10:";; + short | recursive ) echo "Configuration of yast2 2.21.11:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.21.10 +yast2 configure 2.21.11 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,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 $as_me 2.21.10, which was +It was created by yast2 $as_me 2.21.11, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.21.10' + VERSION='2.21.11' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.10" +VERSION="2.21.11" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" @@ -3498,7 +3498,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.21.10, which was +This file was extended by yast2 $as_me 2.21.11, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3551,7 +3551,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.21.10 +yast2 config.status 2.21.11 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/configure.in new/yast2-2.21.11/configure.in --- old/yast2-2.21.10/configure.in 2011-08-03 11:04:57.000000000 +0200 +++ new/yast2-2.21.11/configure.in 2011-08-08 13:24:39.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.10, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.11, http://bugs.opensuse.org/, yast2) 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.21.10" +VERSION="2.21.11" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/hardware.desktop new/yast2-2.21.11/library/desktop/groups/hardware.desktop --- old/yast2-2.21.10/library/desktop/groups/hardware.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/hardware.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/high_availability.desktop new/yast2-2.21.11/library/desktop/groups/high_availability.desktop --- old/yast2-2.21.10/library/desktop/groups/high_availability.desktop 2011-06-22 17:09:31.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/high_availability.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/misc.desktop new/yast2-2.21.11/library/desktop/groups/misc.desktop --- old/yast2-2.21.10/library/desktop/groups/misc.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/misc.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/network_devices.desktop new/yast2-2.21.11/library/desktop/groups/network_devices.desktop --- old/yast2-2.21.10/library/desktop/groups/network_devices.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/network_devices.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/network_services.desktop new/yast2-2.21.11/library/desktop/groups/network_services.desktop --- old/yast2-2.21.10/library/desktop/groups/network_services.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/network_services.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/security.desktop new/yast2-2.21.11/library/desktop/groups/security.desktop --- old/yast2-2.21.10/library/desktop/groups/security.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/security.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/software.desktop new/yast2-2.21.11/library/desktop/groups/software.desktop --- old/yast2-2.21.10/library/desktop/groups/software.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/software.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/support.desktop new/yast2-2.21.11/library/desktop/groups/support.desktop --- old/yast2-2.21.10/library/desktop/groups/support.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/support.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/desktop/groups/system.desktop new/yast2-2.21.11/library/desktop/groups/system.desktop --- old/yast2-2.21.10/library/desktop/groups/system.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.11/library/desktop/groups/system.desktop 2011-08-05 16:14:55.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Qt;X-SuSE-YaST; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/modules/Version.ycp new/yast2-2.21.11/library/modules/Version.ycp --- old/yast2-2.21.10/library/modules/Version.ycp 2011-08-03 11:05:03.000000000 +0200 +++ new/yast2-2.21.11/library/modules/Version.ycp 2011-08-08 13:24:45.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.10"; +global string yast2 = "2.21.11"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.10/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.21.11/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.21.10/library/packages/src/SignatureCheckDialogs.ycp 2008-11-18 19:14:06.000000000 +0100 +++ new/yast2-2.21.11/library/packages/src/SignatureCheckDialogs.ycp 2011-08-08 13:07:19.000000000 +0200 @@ -482,6 +482,35 @@ + (key["expires"]:"" != "" ? "\n" + sformat(_("Expires: %1"), key["expires"]:"") : ""); } + term GPGKeyAsTerm(map<string,any> key) + { + boolean no_fingerprint = key["fingerprint"]:"" == nil || key["fingerprint"]:"" == ""; + boolean no_exp_date = key["expires"]:"" == nil || key["expires"]:"" == ""; + boolean no_create_date = key["created"]:"" == nil || key["expires"]:"" == ""; + + return `HBox( + `VBox( + // GPG key property + `Left(`Label(_("ID: "))), + // GPG key property + `Left(`Label(_("Name: "))), + // GPG key property + no_fingerprint ? `Empty() : `Left(`Label(_("Fingerprint: "))), + // GPG key property + no_create_date ? `Empty() : `Left(`Label(_("Created: "))), + // GPG key property + no_exp_date ? `Empty() : `Left(`Label(_("Expires: "))) + ), + `VBox( + `Left(`Label(key["id"]:"")), + `Left(`Label(key["name"]:"")), + no_fingerprint ? `Empty() : `Left(`Label(StringSplitter(key["fingerprint"]:"", " ", 4))), + no_create_date ? `Empty() : `Left(`Label(key["created"]:"")), + no_exp_date ? `Empty() : `Left(`Label(key["expires"]:"")) + ) + ); + } + /** * Used for corrupted file or package. Opens dialog asking whether user wants * to use this corrupted item. @@ -830,39 +859,47 @@ importing the key into your keyring of trusted keys allows the key owner to have a certain amount of control over the software on your system.</p>") + - // additional Richtext (HTML) warning text (kind of help), 2/2, %1 stands for the GnuPG key ID - sformat(_("<p>A warning dialog opens for every package that -is not signed by a trusted (imported) key. If you do not import the key, -packages created by the owner of key <tt>%1</tt> show this warning.</p>"), key["id"]:""); + // additional Richtext (HTML) warning text (kind of help), 2/2 + _("<p>A warning dialog opens for every package that +is not signed by a trusted (imported) key. If you do not trust the key, +the packages or repositories created by the owner of the key will not be used.</p>"); map repo = Pkg::SourceGeneralData(repository); - // popup message, %1 stands for string "GPG key ID\nfingerprint", %2 for key name - string dialog_text = sformat(_("The following GnuPG key has been found in repository %1 -%2: - -%3 + // popup message - label, part 1, %1 stands for repository name, %2 for its URL + string dialog_text = sformat(_("The following GnuPG key has been found in repository\n%1\n(%2):"), + repo["name"]:_("Unknown"), + repo["url"]:_("Unknown")); -You can choose to import it into your keyring of trusted + // popup message - label, part 2 + string dialog_text2 = _("You can choose to import it into your keyring of trusted public keys, meaning that you trust the owner of the key. You should be sure that you can trust the owner and that -the key really belongs to that owner before importing it."), - repo["name"]:_("Unknown"), - repo["url"]:_("Unknown"), - "\n" + - GPGKeyAsString(key) - ); +the key really belongs to that owner before importing it."); + + integer expires = key["expires_raw"]:0; + if (expires > 0 && time() > expires) + { + // warning label - the key to import is expired + dialog_text2 = sformat(_("WARNING: The key has expired!")) + "\n\n" + dialog_text2; + } + + map displayinfo = UI::GetDisplayInfo(); + // hide additional help text in not enough wide terminals so + // the important GPG key properties are completely displayed + boolean hide_help = displayinfo["TextMode"]:false && displayinfo["Width"]:80 < 105; UI::OpenDialog( `opt(`decorated), `HBox ( `VSpacing(19), // left-side help - `HWeight(3, - `VBox ( - `RichText(warning_text) - ) - ), + hide_help ? `Empty() : + `HWeight(3, + `VBox ( + `RichText(warning_text) + ) + ), `HSpacing(1.5), // dialog `HWeight(5, @@ -876,16 +913,22 @@ `HStretch() ), // dialog message - `MarginBox(0.5, 0.5, `Label(dialog_text)) + `MarginBox(0.5, 0.5, `VBox( + `Left(`Label(dialog_text)), + `VSpacing(0.5), + GPGKeyAsTerm(key), + `VSpacing(0.5), + `Left(`Label(dialog_text2)) + ) + ) ) ), // dialog buttons `Bottom( `ButtonBox ( // push button - `PushButton(`id(`import), `opt (`key_F10, `okButton), _("&Import")), - // push button - `PushButton(`id(`dont_import), `opt (`key_F9, `cancelButton), _("Do &Not Import")) + `PushButton(`id(`trust), `opt (`key_F10, `okButton), _("&Trust")), + `PushButton(`id(`cancel), `opt (`key_F9, `cancelButton), Label::CancelButton()) ) ) ) @@ -893,17 +936,9 @@ ) ); - // No details available - disable button - // if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false); - UI::SetFocus(`dont_import); + UI::SetFocus(`cancel); - symbol ret = nil; - while (ret == nil || ret == `details) { - // wait for one of listed ID's, return the default value in case of `cancel - ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import); - if (contains([`import, `dont_import], ret)) break; - // else if (ret == `details) Popup::LongMessage(key_detailed_description); - } + symbol ret = (symbol)UI::UserInput(); UI::CloseDialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
