Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Feb 12 13:10:33 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-09 15:42:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-02-12 13:03:34.810421000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 12 09:28:28 CET 2007 - lslezak@suse.cz
+
+- Fixed AcceptUnknownGpgKey() and TrustGpgKey() GPG callback
+ handlers (#242087, #240771)
+- 2.15.10
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.9.tar.bz2
New:
----
yast2-packager-2.15.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.H20806/_old 2007-02-12 13:09:50.000000000 +0100
+++ /var/tmp/diff_new_pack.H20806/_new 2007-02-12 13:09:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.9)
+# spec file for package yast2-packager (Version 2.15.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.9
+Version: 2.15.10
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.9.tar.bz2
+Source0: yast2-packager-2.15.10.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: yast2-country
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.9
+%setup -n yast2-packager-2.15.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Mon Feb 12 2007 - lslezak@suse.cz
+- Fixed AcceptUnknownGpgKey() and TrustGpgKey() GPG callback
+ handlers (#242087, #240771)
+- 2.15.10
* Fri Feb 09 2007 - lslezak@suse.cz
- ignore mounted sources in SpaceCalculation::EvaluateFreeSpace()
(#221308)
++++++ yast2-packager-2.15.9.tar.bz2 -> yast2-packager-2.15.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.9/configure new/yast2-packager-2.15.10/configure
--- old/yast2-packager-2.15.9/configure 2007-02-09 15:37:09.000000000 +0100
+++ new/yast2-packager-2.15.10/configure 2007-02-12 13:02:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.9.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.10.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.9'
-PACKAGE_STRING='yast2-packager 2.15.9'
+PACKAGE_VERSION='2.15.10'
+PACKAGE_STRING='yast2-packager 2.15.10'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.15.9 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.9:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.10:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.9
+yast2-packager configure 2.15.10
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.15.9, which was
+It was created by yast2-packager $as_me 2.15.10, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.9'
+ VERSION='2.15.10'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.9"
+VERSION="2.15.10"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.9, which was
+This file was extended by yast2-packager $as_me 2.15.10, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.9
+yast2-packager config.status 2.15.10
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.9/configure.in new/yast2-packager-2.15.10/configure.in
--- old/yast2-packager-2.15.9/configure.in 2007-02-09 15:37:03.000000000 +0100
+++ new/yast2-packager-2.15.10/configure.in 2007-02-12 13:02:50.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.9, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.10, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.9"
+VERSION="2.15.10"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.9/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.15.10/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.15.9/src/modules/SignatureCheckCallbacks.ycp 2007-02-09 13:28:47.000000000 +0100
+++ new/yast2-packager-2.15.10/src/modules/SignatureCheckCallbacks.ycp 2007-02-12 12:56:38.000000000 +0100
@@ -85,7 +85,7 @@
// (+DontShowAgain functionality) -- for one run in memory
//
/* function for CallbackAcceptUnknownGpgKey() */
- global boolean AcceptUnknownGpgKey (string filename, string keyid, string keyname, string fingerprint) {
+ global boolean AcceptUnknownGpgKey (string filename, string keyid) {
// Check signatures at all?
if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
return default_return_unchecked;
@@ -95,7 +95,7 @@
// Show the popup?
if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident, filename)) {
// Unknown keyname == "Unknown Key"
- return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, fingerprint, keyname, dont_show_dialog_ident);
+ return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, dont_show_dialog_ident);
// Return the default value entered by user
} else {
return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename);
@@ -109,6 +109,23 @@
//
// zypp: askUserToTrustKey
//
+ /* function for CallbackTrustGpgKey() */
+ global boolean TrustGpgKey (string filename, string keyid, string keyname, string fingerprint) {
+ // 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::ItemSignedWithPublicSignature(`file, filename, keyid, keyname) == `trust;
+ }
+
+ // Name of the callback handler function. Required callback prototype is
+ // boolean(string keyid, string keyname, string keydetails). The callback
+ // function should ask user whether the key is trusted, returned true value
+ // means the key is trusted.
+ //
+ // zypp: askUserToImportKey
+ //
/* function for CallbackImportGpgKey() */
global boolean ImportGpgKey (string keyid, string keyname, string fingerprint) {
// Check signatures at all?
@@ -116,7 +133,7 @@
return default_return_unchecked;
// There are no details from the callback, maybe in the future
- return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint);
+ return SignatureCheckDialogs::ImportGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint);
}
// Name of the callback handler function. Required callback prototype is
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.9/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.15.10/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.15.9/src/modules/SignatureCheckDialogs.ycp 2007-02-09 13:28:47.000000000 +0100
+++ new/yast2-packager-2.15.10/src/modules/SignatureCheckDialogs.ycp 2007-02-12 12:58:39.000000000 +0100
@@ -534,7 +534,7 @@
* @param string dont_show_dialog_ident for the identification in magic "don't show" functions
* @return boolean true if 'yes, use file'
*/
- global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string fingerprint, string key_name, string dont_show_dialog_ident) {
+ global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string dont_show_dialog_ident) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
_("The package %1 is digitally signed
@@ -559,13 +559,7 @@
item_name,
"\n" +
// Part of the GnuPG key description in popup, %1 is a GnuPG key ID
- sformat(_("ID: %1"), key_id) +
- ((fingerprint == nil || fingerprint == "") ?
- // Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
- "" : sformat("\n" + _("Fingerprint: %1"), StringSplitter(fingerprint, " ", 4)))
-
- // Part of the GnuPG key description in popup, %1 is a GnuPG key name
- + ((key_name != nil && key_name != "") ? sformat("\n" + _("Name: %1"), key_name) : "")
+ sformat(_("ID: %1"), key_id)
);
UI::OpenDialog(
@@ -617,9 +611,7 @@
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set of
-trusted keys with Import Key then proceed
-with the installation.
+If you trust the owner, mark the key as trusted.
Installing a package from an unknown source can put
the integrity of your system at risk. It is safest
@@ -630,9 +622,7 @@
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set of
-trusted keys with Import Key then proceed with
-the installation.
+If you trust the owner, mark the key as trusted.
Installing a file from an unknown source can put
the integrity of your system at risk. It is safest
@@ -651,20 +641,16 @@
`MarginBox(0.5, 0.5, `Label(description_text)),
`HBox (
// push button
- `PushButton(`id(`key_import), _("&Import Key...")),
+ `PushButton(`id(`trust), _("&Trust the Key")),
`HSpacing(1),
- // push button
- `PushButton(`id(`install), _("Install &Anyway")),
- `HSpacing(1),
- // push button
- `PushButton(`id(`skip), _("&Skip Package"))
+ `PushButton(`id(`skip), Label::SkipButton())
)
)
);
UI::SetFocus(`skip);
// wait for one of listed ID's, return the default value in case of `cancel
- symbol ret = WaitForSymbolUserInput([`key_import, `install, `skip], `skip);
+ symbol ret = WaitForSymbolUserInput([`trust, `skip], `skip);
UI::CloseDialog();
return ret;
@@ -779,7 +765,7 @@
* @param string fingerprint
* @return boolean whether zypp should import the key into the keyring of trusted keys
*/
- global boolean ImportUntrustedGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) {
+ global boolean ImportGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) {
// 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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.9/VERSION new/yast2-packager-2.15.10/VERSION
--- old/yast2-packager-2.15.9/VERSION 2007-02-09 15:36:33.000000000 +0100
+++ new/yast2-packager-2.15.10/VERSION 2007-02-12 12:56:54.000000000 +0100
@@ -1 +1 @@
-2.15.9
+2.15.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org