Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Sun Oct 2 11:18:42 CEST 2011.
-------- --- openSUSE:Factory/yast2/yast2.changes 2011-09-23 12:53:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-09-23 16:52:41.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 23 12:00:45 UTC 2011 - [email protected] + +- use Pkg::ResolvableProperties() instead of obsoleted + Pkg::TargetProducts() +- removed obsoleted Pkg::CallbackAcceptNonTrustedGpgKey() and the + related dialog +- 2.21.23 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.21.22.tar.bz2 New: ---- yast2-2.21.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6b79OU/_old 2011-10-02 11:18:37.000000000 +0200 +++ /var/tmp/diff_new_pack.6b79OU/_new 2011-10-02 11:18:37.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.21.22 +Version: 2.21.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.22.tar.bz2 +Source0: yast2-%{version}.tar.bz2 Prefix: /usr @@ -129,7 +129,7 @@ installation with YaST2. %prep -%setup -n yast2-2.21.22 +%setup -n yast2-%{version} %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.21.22.tar.bz2 -> yast2-2.21.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/VERSION new/yast2-2.21.23/VERSION --- old/yast2-2.21.22/VERSION 2011-09-19 08:52:50.000000000 +0200 +++ new/yast2-2.21.23/VERSION 2011-09-23 16:51:27.000000000 +0200 @@ -1 +1 @@ -2.21.22 +2.21.23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/configure new/yast2-2.21.23/configure --- old/yast2-2.21.22/configure 2011-09-19 13:01:22.000000000 +0200 +++ new/yast2-2.21.23/configure 2011-09-23 16:51:58.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.22. +# Generated by GNU Autoconf 2.68 for yast2 2.21.23. # # 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.22' -PACKAGE_STRING='yast2 2.21.22' +PACKAGE_VERSION='2.21.23' +PACKAGE_STRING='yast2 2.21.23' 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.22 to adapt to many kinds of systems. +\`configure' configures yast2 2.21.23 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.22:";; + short | recursive ) echo "Configuration of yast2 2.21.23:";; 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.22 +yast2 configure 2.21.23 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.22, which was +It was created by yast2 $as_me 2.21.23, 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.22' + VERSION='2.21.23' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.22" +VERSION="2.21.23" 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.22, which was +This file was extended by yast2 $as_me 2.21.23, 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.22 +yast2 config.status 2.21.23 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.22/configure.in new/yast2-2.21.23/configure.in --- old/yast2-2.21.22/configure.in 2011-09-19 13:01:19.000000000 +0200 +++ new/yast2-2.21.23/configure.in 2011-09-23 16:51:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.22, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.23, 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.22" +VERSION="2.21.23" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/library/modules/Version.ycp new/yast2-2.21.23/library/modules/Version.ycp --- old/yast2-2.21.22/library/modules/Version.ycp 2011-09-19 13:01:27.000000000 +0200 +++ new/yast2-2.21.23/library/modules/Version.ycp 2011-09-23 16:52:01.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.22"; +global string yast2 = "2.21.23"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/library/packages/src/PackageCallbacks.ycp new/yast2-2.21.23/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.21.22/library/packages/src/PackageCallbacks.ycp 2011-08-24 03:48:58.000000000 +0200 +++ new/yast2-2.21.23/library/packages/src/PackageCallbacks.ycp 2011-09-23 16:25:24.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 64558 2011-06-23 09:50:05Z lslezak $ + * $Id: PackageCallbacks.ycp 66005 2011-09-23 14:25:23Z lslezak $ * */ @@ -2913,7 +2913,6 @@ Pkg::CallbackAcceptUnsignedFile (SignatureCheckCallbacks::AcceptUnsignedFile); Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey); Pkg::CallbackImportGpgKey (SignatureCheckCallbacks::ImportGpgKey); - Pkg::CallbackAcceptNonTrustedGpgKey (SignatureCheckCallbacks::TrustGpgKey); Pkg::CallbackAcceptVerificationFailed (SignatureCheckCallbacks::AcceptVerificationFailed); Pkg::CallbackTrustedKeyAdded (SignatureCheckCallbacks::TrustedKeyAdded); Pkg::CallbackTrustedKeyRemoved (SignatureCheckCallbacks::TrustedKeyRemoved); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/library/packages/src/Product.ycp new/yast2-2.21.23/library/packages/src/Product.ycp --- old/yast2-2.21.22/library/packages/src/Product.ycp 2011-08-19 09:48:58.000000000 +0200 +++ new/yast2-2.21.23/library/packages/src/Product.ycp 2011-09-23 14:01:16.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: Product.ycp 51516 2008-09-25 13:04:43Z lslezak $ + * $Id: Product.ycp 65977 2011-09-23 12:01:15Z lslezak $ */ { @@ -82,8 +82,8 @@ } y2milestone ("Looking for base products"); - list<map<string,any> > products = (list<map<string,any> >) - Pkg::TargetProducts (); + list<map<string,any> > products = (list<map<string,any> >) Pkg::ResolvableProperties("", `product, ""); + products = filter(map<string,any> p, products, {return p["status"]:`none == `installed;}); y2milestone("All found products: %1", products); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/library/packages/src/SignatureCheckCallbacks.ycp new/yast2-2.21.23/library/packages/src/SignatureCheckCallbacks.ycp --- old/yast2-2.21.22/library/packages/src/SignatureCheckCallbacks.ycp 2011-08-19 09:48:54.000000000 +0200 +++ new/yast2-2.21.23/library/packages/src/SignatureCheckCallbacks.ycp 2011-09-23 16:21:55.000000000 +0200 @@ -154,24 +154,6 @@ // function should ask user whether the key is trusted, returned true value // means the key is trusted. // - // zypp: askUserToTrustKey - // - /* function for CallbackTrustGpgKey() */ - global boolean TrustGpgKey (map<string,any> key) - { - // Check signatures at all? - if (SignatureCheckDialogs::CheckSignaturesInYaST() == false) - return default_return_unchecked; - - // There are no details from the callback, maybe in the future - return SignatureCheckDialogs::ImportGPGKeyDialog(key) == `import; - } - - // Name of the callback handler function. Required callback prototype is - // boolean(map<string,any> key). The callback - // function should ask user whether the key is trusted, returned true value - // means the key is trusted. - // // zypp: askUserToImportKey // /* function for CallbackImportGpgKey() */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.22/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.21.23/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.21.22/library/packages/src/SignatureCheckDialogs.ycp 2011-09-15 10:35:45.000000000 +0200 +++ new/yast2-2.21.23/library/packages/src/SignatureCheckDialogs.ycp 2011-09-23 16:22:31.000000000 +0200 @@ -726,122 +726,6 @@ } /** - * ImportGPGKeyDialog - * - * @param string key_id - * @param string key_name - * @param string key_location - * @param string key_fingerprint - * @return symbol - */ - global symbol ImportGPGKeyDialog (map<string,any> key) - { - // additional Richtext (HTML) warning text (kind of help), 1/2 - string warning_text = _("<p>The owner of the key may distribute updates, -packages, and package repositories that your system will trust and offer -for installation and update without any further warning. In this way, -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"]:""); - - // expiration warning - string exp_str = ""; - - integer expires = key["expires_raw"]:0; - if (expires > 0 && time() > expires) - { - // %x = date only (without time) - map out = (map)SCR::Execute(.target.bash_output, "date +%x"); - string current_date = out["stdout"]:""; - y2milestone( "Current date: %1", current_date); - - // warning label - the key to import is expired - // %1 is current date (formatted according to the current locale) - exp_str = "\n" + sformat(_("WARNING: The key has expired! -Expiry date: %1"), current_date); - } - - // popup message, %1 stands for GPG key complete multiline description, %2 for key location (URL or ...) - string dialog_text = sformat(_("The GnuPG key %1 -has been found at %2. - -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."), - "\n" + - GPGKeyAsString(key) + exp_str, - key["path"]:"" - ); - - UI::OpenDialog( - `opt(`decorated), - `HBox ( - `VSpacing(19), - // left-side help - `HWeight(3, - `VBox ( - `RichText(warning_text) - ) - ), - `HSpacing(1.5), - // dialog - `HWeight(5, - `VBox( - `Top ( - `VBox ( - `HBox ( - `VCenter(MessageIcon("question")), - // popup heading - `VCenter(`Heading(_("Import Public GnuPG Key"))), - `HStretch() - ), - // dialog message - `MarginBox(0.5, 0.5, `Label(dialog_text)) - ) - ), - // dialog buttons - `Bottom( - `ButtonBox ( - // push button - `PushButton (`id (`import), `opt (`okButton, `key_F10), _("&Import")), - // push button - `PushButton (`id (`dont_import), `opt (`cancelButton, `key_F9), _("Do &Not Import")) - ) - ) - ) - ) - ) - ); - - // No details available - disable button - // if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false); - UI::SetFocus(`dont_import); - - 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); - } - - if (ret == `import) { - // later, if asking whether to import the key, the key is trusted - // so it will be also imported - // bugzilla #282254 - list_of_trusted_keys = add (list_of_trusted_keys, key["id"]:""); - } - - UI::CloseDialog(); - return ret; - } - - /** * ImportUntrustedGPGKeyIntoTrustedDialog * * @param string key_id continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
