Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Apr 5 17:47:46 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-04 14:35:55.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-05 16:28:15.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 5 16:28:24 CEST 2006 - lslezak@suse.cz
+
+- updated keyring callbacks
+- 2.13.47
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.46.tar.bz2
New:
----
yast2-pkg-bindings-2.13.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.WfFwif/_old 2006-04-05 17:47:31.000000000 +0200
+++ /var/tmp/diff_new_pack.WfFwif/_new 2006-04-05 17:47:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.46)
+# spec file for package yast2-pkg-bindings (Version 2.13.47)
#
# 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.13.46
+Version: 2.13.47
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.46.tar.bz2
+Source0: yast2-pkg-bindings-2.13.47.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 libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.46
+%setup -n yast2-pkg-bindings-2.13.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Apr 05 2006 - lslezak@suse.cz
+- updated keyring callbacks
+- 2.13.47
* Tue Apr 04 2006 - mvidner@suse.cz
- Added "alias" to Pkg::SourceGeneralData (#156030).
- libzypp API change: use location instead of plainRpm.
++++++ yast2-pkg-bindings-2.13.46.tar.bz2 -> yast2-pkg-bindings-2.13.47.tar.bz2 ++++++
++++ 14594 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-pkg-bindings-2.13.46/VERSION new/yast2-pkg-bindings-2.13.47/VERSION
--- old/yast2-pkg-bindings-2.13.46/VERSION 2006-04-04 14:33:49.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.47/VERSION 2006-04-05 16:28:18.000000000 +0200
@@ -1 +1 @@
-2.13.46
+2.13.47
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-pkg-bindings-2.13.46/configure.in new/yast2-pkg-bindings-2.13.47/configure.in
--- old/yast2-pkg-bindings-2.13.46/configure.in 2006-04-04 14:37:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.47/configure.in 2006-03-27 16:16:48.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.46, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.41, http://www.suse.de/feedback, 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.13.46"
+VERSION="2.13.41"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -158,7 +158,6 @@
AC_HEADER_STDC
-PKG_CHECK_MODULES([ZYPP], [libzypp])
AX_CHECK_DOCBOOK
AC_CONFIG_FILES(Makefile doc/Makefile
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-pkg-bindings-2.13.46/src/Callbacks.cc new/yast2-pkg-bindings-2.13.47/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.46/src/Callbacks.cc 2006-04-04 14:20:53.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.47/src/Callbacks.cc 2006-04-05 15:17:49.000000000 +0200
@@ -795,8 +795,8 @@
{
KeyRingReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
- virtual bool askUserToTrustKey( const std::string keyid
- , const std::string keyname )
+ virtual bool askUserToTrustKey( const std::string &keyid
+ , const std::string &keyname, const std::string &keydetails )
{
CB callback( ycpcb( YCPCallbacks::CB_ImportGpgKey) );
@@ -804,27 +804,29 @@
{
callback.addStr(keyid);
callback.addStr(keyname);
+ callback.addStr(keydetails);
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname);
+ return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, keydetails);
}
- virtual bool askUserToAcceptUnknownKey( const std::string &keyid,
- const std::string &keyname )
+ virtual bool askUserToAcceptUnknownKey( const zypp::Pathname &path,
+ const std::string &keyid, const std::string &keyname )
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptUnknownGpgKey) );
if (callback._set)
{
+ callback.addStr(path.asString());
callback.addStr(keyid);
callback.addStr(keyname);
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToAcceptUnknownKey(keyid, keyname);
+ return zypp::KeyRingReport::askUserToAcceptUnknownKey(path, keyid, keyname);
}
virtual bool askUserToAcceptUnsignedFile( const zypp::Pathname &file )
@@ -1070,7 +1072,7 @@
/**
* @builtin CallbackImportGpgKey
* @short Register callback function
- * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname)</code>. The callback function should ask user whether the key is trusted, returned true value means the key is trusted.
+ * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname, string keydetails)</code>. The callback function should ask user whether the key is trusted, returned true value means the key is trusted.
* @return void
*/
YCPValue PkgModuleFunctions::CallbackImportGpgKey( const YCPString& args ) {
@@ -1080,7 +1082,7 @@
/**
* @builtin CallbackAcceptUnknownGpgKey
* @short Register callback function
- * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname)</code>. The callback function should ask user whether the unknown key can be accepted, returned true value means to accept the file.
+ * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string filename, string keyid, string keyname)</code>. The callback function should ask user whether the unknown key can be accepted, returned true value means to accept the file.
* @return void
*/
YCPValue PkgModuleFunctions::CallbackAcceptUnknownGpgKey( const YCPString& args ) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...