Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Tue Aug 29 00:09:53 CEST 2006.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-08-22 15:53:49.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-08-28 14:53:54.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 14:13:46 CEST 2006 - dmacvicar@suse.de
+
+- adapt to zypp 2.1.0 Keyring callbacks
+- r4039
+
+-------------------------------------------------------------------
Old:
----
zmd-backend-7.1.1.0_0.1.tar.bz2
New:
----
zmd-backend-7.1.1.0_0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.V9QIEc/_old 2006-08-29 00:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.V9QIEc/_new 2006-08-29 00:09:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp-zmd-backend (Version 7.1.1.0_0.1)
+# spec file for package libzypp-zmd-backend (Version 7.1.1.0_0.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: libzypp-zmd-backend
-Version: 7.1.1.0_0.1
+Version: 7.1.1.0_0.2
Release: 1
License: GPL
Group: System/Management
@@ -23,9 +23,10 @@
Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dejagnu gcc-c++ sqlite-devel
-# API Changes in zypp 2.0
-BuildRequires: libzypp-devel >= 2.0.0
-BuildRequires: libzypp >= 2.0.0
+# API Changes in zypp 2.1
+BuildRequires: libzypp-devel >= 2.1.0
+BuildRequires: libzypp >= 2.1.0
+Requires: libzypp >= 2.1.0
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
@@ -71,6 +72,9 @@
/etc/logrotate.d/zmd-backend
%changelog -n libzypp-zmd-backend
+* Mon Aug 28 2006 - dmacvicar@suse.de
+- adapt to zypp 2.1.0 Keyring callbacks
+- r4039
* Tue Aug 22 2006 - dmacvicar@suse.de
- don't require zypp-devel (#200809)
- r4014
++++++ zmd-backend-7.1.1.0_0.1.tar.bz2 -> zmd-backend-7.1.1.0_0.2.tar.bz2 ++++++
++++ 12596 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/zmd-backend-7.1.1.0_0.1/VERSION new/zmd-backend-7.1.1.0_0.2/VERSION
--- old/zmd-backend-7.1.1.0_0.1/VERSION 2006-08-10 11:51:07.000000000 +0200
+++ new/zmd-backend-7.1.1.0_0.2/VERSION 2006-08-28 14:10:14.000000000 +0200
@@ -1 +1 @@
-m4_define([BACKEND_VERSION], [7.1.1.0_0.1])
+m4_define([BACKEND_VERSION], [7.1.1.0_0.2])
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/zmd-backend-7.1.1.0_0.1/config.h.in new/zmd-backend-7.1.1.0_0.2/config.h.in
--- old/zmd-backend-7.1.1.0_0.1/config.h.in 2006-08-10 11:51:36.000000000 +0200
+++ new/zmd-backend-7.1.1.0_0.2/config.h.in 2006-08-28 14:11:17.000000000 +0200
@@ -19,15 +19,27 @@
*/
#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the `argz_count' function. */
+#undef HAVE_ARGZ_COUNT
+
/* Define to 1 if you have the header file. */
#undef HAVE_ARGZ_H
+/* Define to 1 if you have the `argz_next' function. */
+#undef HAVE_ARGZ_NEXT
+
+/* Define to 1 if you have the `argz_stringify' function. */
+#undef HAVE_ARGZ_STRINGIFY
+
/* Define to 1 if you have the `asprintf' function. */
#undef HAVE_ASPRINTF
/* Define to 1 if you have the header file. */
#undef HAVE_BOOST_SCOPED_PTR_HPP
+/* Define to 1 if the compiler understands __builtin_expect. */
+#undef HAVE_BUILTIN_EXPECT
+
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
@@ -109,18 +121,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_LIMITS_H
-/* Define to 1 if you have the header file. */
-#undef HAVE_LOCALE_H
-
/* Define if you have the 'long double' type. */
#undef HAVE_LONG_DOUBLE
/* Define if you have the 'long long' type. */
#undef HAVE_LONG_LONG
-/* Define to 1 if you have the header file. */
-#undef HAVE_MALLOC_H
-
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
@@ -133,12 +139,19 @@
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
-/* Define to 1 if you have the header file. */
-#undef HAVE_NL_TYPES_H
+/* Define if you have and it defines the NL_LOCALE_NAME macro if
+ _GNU_SOURCE is defined. */
+#undef HAVE_NL_LOCALE_NAME
/* Define if your printf() function supports format strings with positions. */
#undef HAVE_POSIX_PRINTF
+/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */
+#undef HAVE_PTHREAD_MUTEX_RECURSIVE
+
+/* Define if the POSIX multithreading library has read/write locks. */
+#undef HAVE_PTHREAD_RWLOCK
+
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
@@ -203,6 +216,10 @@
/* Define if you have the 'unsigned long long' type. */
#undef HAVE_UNSIGNED_LONG_LONG
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+ declarations. */
+#undef HAVE_VISIBILITY
+
/* Define if you have the 'wchar_t' type. */
#undef HAVE_WCHAR_T
@@ -212,15 +229,6 @@
/* Define if you have the 'wint_t' type. */
#undef HAVE_WINT_T
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
/* Define to 1 if you have the `__fsetlocking' function. */
#undef HAVE___FSETLOCKING
@@ -254,6 +262,9 @@
/* Define if exists and defines unusable PRI* macros. */
#undef PRI_MACROS_BROKEN
+/* Define if the pthread_in_use() detection is hard. */
+#undef PTHREAD_IN_USE_DETECTION_HARD
+
/* Define as the maximum value of type 'size_t', if the system doesn't define
it. */
#undef SIZE_MAX
@@ -272,27 +283,50 @@
/* gettext textdomain */
#undef TEXTDOMAIN
+/* Define if the POSIX multithreading library can be used. */
+#undef USE_POSIX_THREADS
+
+/* Define if references to the POSIX multithreading library should be made
+ weak. */
+#undef USE_POSIX_THREADS_WEAK
+
+/* Define if the GNU Pth multithreading library can be used. */
+#undef USE_PTH_THREADS
+
+/* Define if references to the GNU Pth multithreading library should be made
+ weak. */
+#undef USE_PTH_THREADS_WEAK
+
+/* Define if the old Solaris multithreading library can be used. */
+#undef USE_SOLARIS_THREADS
+
+/* Define if references to the old Solaris multithreading library should be
+ made weak. */
+#undef USE_SOLARIS_THREADS_WEAK
+
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
+
/* Version number of package */
#undef VERSION
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
-/* Define to `long int' if does not define. */
-#undef off_t
-
/* Define as the type of the result of subtracting two pointers, if the system
doesn't define it. */
#undef ptrdiff_t
@@ -306,3 +340,35 @@
/* Define to unsigned long or unsigned long long if and
don't define. */
#undef uintmax_t
+
+
+#define __libc_lock_t gl_lock_t
+#define __libc_lock_define gl_lock_define
+#define __libc_lock_define_initialized gl_lock_define_initialized
+#define __libc_lock_init gl_lock_init
+#define __libc_lock_lock gl_lock_lock
+#define __libc_lock_unlock gl_lock_unlock
+#define __libc_lock_recursive_t gl_recursive_lock_t
+#define __libc_lock_define_recursive gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive gl_recursive_lock_init
+#define __libc_lock_lock_recursive gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
+#define glthread_in_use libintl_thread_in_use
+#define glthread_lock_init libintl_lock_init
+#define glthread_lock_lock libintl_lock_lock
+#define glthread_lock_unlock libintl_lock_unlock
+#define glthread_lock_destroy libintl_lock_destroy
+#define glthread_rwlock_init libintl_rwlock_init
+#define glthread_rwlock_rdlock libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock libintl_rwlock_wrlock
+#define glthread_rwlock_unlock libintl_rwlock_unlock
+#define glthread_rwlock_destroy libintl_rwlock_destroy
+#define glthread_recursive_lock_init libintl_recursive_lock_init
+#define glthread_recursive_lock_lock libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
+#define glthread_once libintl_once
+#define glthread_once_call libintl_once_call
+#define glthread_once_singlethreaded libintl_once_singlethreaded
+
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/zmd-backend-7.1.1.0_0.1/libzypp-zmd-backend.spec.in new/zmd-backend-7.1.1.0_0.2/libzypp-zmd-backend.spec.in
--- old/zmd-backend-7.1.1.0_0.1/libzypp-zmd-backend.spec.in 2006-08-22 13:10:03.000000000 +0200
+++ new/zmd-backend-7.1.1.0_0.2/libzypp-zmd-backend.spec.in 2006-08-28 14:10:04.000000000 +0200
@@ -24,9 +24,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dejagnu gcc-c++ sqlite-devel
-# API Changes in zypp 2.0
-BuildRequires: libzypp-devel >= 2.0.0
-BuildRequires: libzypp >= 2.0.0
+# API Changes in zypp 2.1
+BuildRequires: libzypp-devel >= 2.1.0
+BuildRequires: libzypp >= 2.1.0
+Requires: libzypp >= 2.1.0
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr
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/zmd-backend-7.1.1.0_0.1/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0_0.2/src/KeyRingCallbacks.h
--- old/zmd-backend-7.1.1.0_0.1/src/KeyRingCallbacks.h 2006-06-23 13:33:58.000000000 +0200
+++ new/zmd-backend-7.1.1.0_0.2/src/KeyRingCallbacks.h 2006-08-25 11:25:51.000000000 +0200
@@ -79,25 +79,32 @@
std::cout << "21|" << file << std::endl;
return readCallbackAnswer();
}
- virtual bool askUserToAcceptUnknownKey( const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
+ virtual bool askUserToAcceptUnknownKey( const std::string &file, const std::string &id )
{
if (!_enabled) return true;
- DBG << "22|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
- std::cout << "22|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
+ DBG << "22|" << file << "|" << id << "|" << keyname << "|" << fingerprint << std::endl;
+ std::cout << "22|" << file << "|" << id << "|" << "Unknown name" << "|" << "unknown fingerprint" << std::endl;
return readCallbackAnswer();
}
- virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
+
+ virtual bool askUserToImportKey( const PublicKey &key )
+ {
+ DBG << "By default backend does not import keys for now." << std::endl;
+ return false;
+ }
+
+ virtual bool askUserToTrustKey( const PublicKey &key )
{
if (!_enabled) return true;
- DBG << "23|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
- std::cout << "23|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
+ DBG << "23|" << key.id() << "|" << key.name() << "|" << key.fingerprint() << std::endl;
+ std::cout << "23|" << key.id() << "|" << key.name() << "|" << key.fingerprint() << std::endl;
return readCallbackAnswer();
}
- virtual bool askUserToAcceptVerificationFailed( const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
+ virtual bool askUserToAcceptVerificationFailed( const std::string &file, const PublicKey &key )
{
if (!_enabled) return true;
- DBG << "24|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
- std::cout << "24|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl;
+ DBG << "24|" << file << "|" << key.id() << "|" << key.name() << "|" << key.fingerprint() << std::endl;
+ std::cout << "24|" << file << "|" << key.id() << "|" << key.name() << "|" << key.fingerprint() << std::endl;
return readCallbackAnswer();
}
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org