Mailinglist Archive: opensuse-commit (1500 mails)

< Previous Next >
commit yast2-pkg-bindings
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 15 Nov 2006 18:23:24 +0100 (CET)
  • Message-id: <20061115172324.CD57319AA4C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Nov 15 18:23:24 CET 2006.

--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-13 14:52:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-15 10:41:53.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 15 10:23:46 CET 2006 - lslezak@xxxxxxx
+
+- fixed GPG key callbacks - allow yast to import keys (#219965)
+- 2.14.1
+
+-------------------------------------------------------------------

Old:
----
yast2-pkg-bindings-2.14.0.tar.bz2

New:
----
yast2-pkg-bindings-2.14.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.0YmAE0/_old 2006-11-15 18:22:37.000000000 +0100
+++ /var/tmp/diff_new_pack.0YmAE0/_new 2006-11-15 18:22:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.14.0)
+# spec file for package yast2-pkg-bindings (Version 2.14.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild

Name: yast2-pkg-bindings
-Version: 2.14.0
+Version: 2.14.1
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.14.0.tar.bz2
+Source0: yast2-pkg-bindings-2.14.1.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 2.4.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky <visnov@xxxxxxx>

%prep
-%setup -n yast2-pkg-bindings-2.14.0
+%setup -n yast2-pkg-bindings-2.14.1

%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,9 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings

%changelog -n yast2-pkg-bindings
+* Wed Nov 15 2006 - lslezak@xxxxxxx
+- fixed GPG key callbacks - allow yast to import keys (#219965)
+- 2.14.1
* Mon Nov 13 2006 - lslezak@xxxxxxx
- disable refresh of all sources in the target during update
(workaround for #220056)

++++++ yast2-pkg-bindings-2.14.0.tar.bz2 -> yast2-pkg-bindings-2.14.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.0/VERSION new/yast2-pkg-bindings-2.14.1/VERSION
--- old/yast2-pkg-bindings-2.14.0/VERSION 2006-11-13 09:50:09.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.1/VERSION 2006-11-15 10:25:04.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.14.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.0/configure new/yast2-pkg-bindings-2.14.1/configure
--- old/yast2-pkg-bindings-2.14.0/configure 2006-11-13 14:49:24.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.1/configure 2006-11-15 10:38:29.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-pkg-bindings 2.14.0.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.14.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.14.0'
-PACKAGE_STRING='yast2-pkg-bindings 2.14.0'
+PACKAGE_VERSION='2.14.1'
+PACKAGE_STRING='yast2-pkg-bindings 2.14.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1428,7 +1428,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-pkg-bindings 2.14.0 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.14.1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1499,7 +1499,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.14.0:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.14.1:";;
esac
cat <<\_ACEOF

@@ -1607,7 +1607,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.14.0
+yast2-pkg-bindings configure 2.14.1
generated by GNU Autoconf 2.60

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1621,7 +1621,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-pkg-bindings $as_me 2.14.0, which was
+It was created by yast2-pkg-bindings $as_me 2.14.1, which was
generated by GNU Autoconf 2.60. Invocation command line was

$ $0 $@
@@ -2422,7 +2422,7 @@

# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.14.0'
+ VERSION='2.14.1'


cat >>confdefs.h <<_ACEOF
@@ -2649,7 +2649,7 @@



-VERSION="2.14.0"
+VERSION="2.14.1"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lslezak@xxxxxxx>"

@@ -21609,7 +21609,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.14.0, which was
+This file was extended by yast2-pkg-bindings $as_me 2.14.1, which was
generated by GNU Autoconf 2.60. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -21662,7 +21662,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.14.0
+yast2-pkg-bindings config.status 2.14.1
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.0/configure.in new/yast2-pkg-bindings-2.14.1/configure.in
--- old/yast2-pkg-bindings-2.14.0/configure.in 2006-11-13 14:49:11.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.1/configure.in 2006-11-15 10:38:14.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-pkg-bindings, 2.14.0, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.14.1, http://bugs.opensuse.org/, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs

dnl Important YaST2 variables
-VERSION="2.14.0"
+VERSION="2.14.1"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lslezak@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.0/src/Callbacks.cc new/yast2-pkg-bindings-2.14.1/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.14.0/src/Callbacks.cc 2006-11-08 08:28:20.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.1/src/Callbacks.cc 2006-11-15 10:27:56.000000000 +0100
@@ -1271,7 +1271,7 @@
{
KeyRingReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}

- virtual bool askUserToTrustKey(const zypp::PublicKey& key)
+ virtual bool askUserToImportKey( const zypp::PublicKey &key)
{
CB callback( ycpcb( YCPCallbacks::CB_ImportGpgKey) );

@@ -1284,26 +1284,25 @@
return callback.evaluateBool();
}

- return zypp::KeyRingReport::askUserToTrustKey(key);
+ return zypp::KeyRingReport::askUserToImportKey(key);
}

- virtual bool askUserToAcceptUnknownKey(const std::string &file, const std::string &keyid)
+ virtual bool askUserToTrustKey(const zypp::PublicKey& key)
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptUnknownGpgKey) );

if (callback._set)
{
- callback.addStr(file);
- callback.addStr(keyid);
+ callback.addStr(key.path().asString());
+ callback.addStr(key.id());

- // TODO FIXME: zypp now provides just 2
- callback.addStr(std::string() /*keyname*/);
- callback.addStr(std::string() /*fingerprint*/);
+ callback.addStr(key.name());
+ callback.addStr(key.fingerprint());

return callback.evaluateBool();
}

- return zypp::KeyRingReport::askUserToAcceptUnknownKey(file, keyid);
+ return zypp::KeyRingReport::askUserToTrustKey(key);
}

virtual bool askUserToAcceptUnsignedFile(const std::string &file)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >