Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit yast2-pkg-bindings
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 18 Jan 2008 01:38:18 +0100
  • Message-id: <20080118003818.DC428678335@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Jan 18 01:38:18 CET 2008.

--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-01-14
17:22:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes
2008-01-17 13:13:26.343994000 +0100
@@ -1,0 +2,15 @@
+Thu Jan 17 13:02:06 CET 2008 - lslezak@xxxxxxx
+
+- GPG key callbacks - pass a map with key information in one
+ parameter (instead of 2 or 3 parameters), the map contains more
+ information (see FATE 300754)
+- fixed documentaion of the changed callbacks
+- 2.16.11
+
+-------------------------------------------------------------------
+Tue Jan 15 13:47:35 CET 2008 - lslezak@xxxxxxx
+
+- Pkg::ImportGPGKey() return boolean (true on success) instead of
+ void
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.ya3747/_old 2008-01-18 01:37:35.000000000 +0100
+++ /var/tmp/diff_new_pack.ya3747/_new 2008-01-18 01:37:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.10)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.11)
#
# Copyright (c) 2008 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-devel-doc
-Version: 2.16.10
+Version: 2.16.11
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.16.10.tar.bz2
+Source0: yast2-pkg-bindings-2.16.11.tar.bz2
Prefix: /usr
# same as in the main package (because we use the same configure.in.in)
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
@@ -37,7 +37,7 @@
Ladislav Slez�k <lslezak@xxxxxxxxxx>

%prep
-%setup -n yast2-pkg-bindings-2.16.10
+%setup -n yast2-pkg-bindings-2.16.11
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS

@@ -69,13 +69,13 @@
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README
%changelog
-* Tue Dec 18 2007 - lslezak@xxxxxxx
+* Tue Dec 18 2007 lslezak@xxxxxxx
- updated generating of the documentation to the new source file
layout
- 2.16.7
-* Wed Oct 03 2007 - mvidner@xxxxxxx
+* Wed Oct 03 2007 mvidner@xxxxxxx
- Do not try to package COPYRIGHT.english, it is gone from
devtools (#299144).
- 2.16.0
-* Thu Jul 26 2007 - lslezak@xxxxxxx
+* Thu Jul 26 2007 lslezak@xxxxxxx
- Initial version

++++++ yast2-pkg-bindings.spec ++++++
++++ 1276 lines (skipped)
++++ between yast2-pkg-bindings/yast2-pkg-bindings.spec
++++ and /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.spec

++++++ yast2-pkg-bindings-2.16.10.tar.bz2 -> yast2-pkg-bindings-2.16.11.tar.bz2
++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/configure
new/yast2-pkg-bindings-2.16.11/configure
--- old/yast2-pkg-bindings-2.16.10/configure 2008-01-14 17:21:13.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/configure 2008-01-17 13:06:00.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.16.10.
+# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.16.11.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.16.10'
-PACKAGE_STRING='yast2-pkg-bindings 2.16.10'
+PACKAGE_VERSION='2.16.11'
+PACKAGE_STRING='yast2-pkg-bindings 2.16.11'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

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

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

@@ -1518,7 +1518,7 @@

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

@@ -1627,7 +1627,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.16.10
+yast2-pkg-bindings configure 2.16.11
generated by GNU Autoconf 2.61

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

$ $0 $@
@@ -2462,7 +2462,7 @@

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


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



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

@@ -5575,7 +5576,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5578 "configure"' > conftest.$ac_ext
+ echo '#line 5579 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7615,11 +7616,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7618: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7619: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7622: \$? = $ac_status" >&5
+ echo "$as_me:7623: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7905,11 +7906,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7908: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7909: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7912: \$? = $ac_status" >&5
+ echo "$as_me:7913: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8009,11 +8010,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8012: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8013: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8016: \$? = $ac_status" >&5
+ echo "$as_me:8017: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10358,7 +10359,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10361 "configure"
+#line 10362 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
@@ -10458,7 +10459,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10461 "configure"
+#line 10462 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
@@ -12878,11 +12879,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12882: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12885: \$? = $ac_status" >&5
+ echo "$as_me:12886: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12982,11 +12983,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12985: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12986: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12989: \$? = $ac_status" >&5
+ echo "$as_me:12990: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14544,11 +14545,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14547: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14548: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14551: \$? = $ac_status" >&5
+ echo "$as_me:14552: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14648,11 +14649,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14651: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14652: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14655: \$? = $ac_status" >&5
+ echo "$as_me:14656: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16835,11 +16836,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16838: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16839: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16842: \$? = $ac_status" >&5
+ echo "$as_me:16843: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17125,11 +17126,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17128: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17129: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17132: \$? = $ac_status" >&5
+ echo "$as_me:17133: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17229,11 +17230,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17232: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17233: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17236: \$? = $ac_status" >&5
+ echo "$as_me:17237: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21198,7 +21199,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.16.10, which was
+This file was extended by yast2-pkg-bindings $as_me 2.16.11, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -21251,7 +21252,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.16.10
+yast2-pkg-bindings config.status 2.16.11
configured by $0, generated by GNU Autoconf 2.61,
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.16.10/configure.in
new/yast2-pkg-bindings-2.16.11/configure.in
--- old/yast2-pkg-bindings-2.16.10/configure.in 2008-01-14 17:21:03.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/configure.in 2008-01-17 13:05:49.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

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

@@ -14,10 +14,11 @@

AC_PREFIX_DEFAULT(/usr)

-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)

dnl Important YaST2 variables
-VERSION="2.16.10"
+VERSION="2.16.11"
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.16.10/COPYRIGHT.english
new/yast2-pkg-bindings-2.16.11/COPYRIGHT.english
--- old/yast2-pkg-bindings-2.16.10/COPYRIGHT.english 2008-01-14
17:22:01.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/COPYRIGHT.english 1970-01-01
01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/Makefile.am
new/yast2-pkg-bindings-2.16.11/Makefile.am
--- old/yast2-pkg-bindings-2.16.10/Makefile.am 2008-01-14 17:21:04.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/Makefile.am 2008-01-17 13:05:49.000000000
+0100
@@ -23,13 +23,14 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)

-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING

COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish

extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast),
$(COPYRIGHT_files_gpl))

+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/Makefile.in
new/yast2-pkg-bindings-2.16.11/Makefile.in
--- old/yast2-pkg-bindings-2.16.10/Makefile.in 2008-01-14 17:21:16.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/Makefile.in 2008-01-17 13:06:03.000000000
+0100
@@ -255,11 +255,13 @@
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish

extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast),
$(COPYRIGHT_files_gpl))
+
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/README
new/yast2-pkg-bindings-2.16.11/README
--- old/yast2-pkg-bindings-2.16.10/README 2008-01-14 17:22:01.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/README 2008-01-17 13:13:15.000000000
+0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/Callbacks.cc
new/yast2-pkg-bindings-2.16.11/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.16.10/src/Callbacks.cc 2008-01-03
09:37:26.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/Callbacks.cc 2008-01-16
09:00:09.000000000 +0100
@@ -29,6 +29,7 @@
#include "log.h"
#include "Callbacks.h"
#include "Callbacks.YCP.h" // PkgFunctions::CallbackHandler::YCPCallbacks
+#include "GPGMap.h"

#include <zypp/ZYppCallbacks.h>
#include <zypp/Package.h>
@@ -1593,9 +1594,9 @@

if (callback._set)
{
- callback.addStr(key.id());
- callback.addStr(key.name());
- callback.addStr(key.fingerprint());
+ GPGMap gpgmap(key);
+
+ callback.addMap(gpgmap.getMap());

bool res = callback.evaluateBool();
y2milestone("Callback ImportGpgKey value: %s", res ? "true" :
"false");
@@ -1614,11 +1615,9 @@

if (callback._set)
{
- callback.addStr(key.path().asString());
- callback.addStr(key.id());
+ GPGMap gpgmap(key);

- callback.addStr(key.name());
- callback.addStr(key.fingerprint());
+ callback.addMap(gpgmap.getMap());

bool res = callback.evaluateBool();
y2milestone("Callback AcceptNonTrustedGpgKey value: %s", res ?
"true" : "false");
@@ -1671,10 +1670,10 @@

if (callback._set)
{
+ GPGMap gpgmap(key);
+
callback.addStr(file);
- callback.addStr(key.id());
- callback.addStr(key.name());
- callback.addStr(key.fingerprint());
+ callback.addMap(gpgmap.getMap());

return callback.evaluateBool();
}
@@ -1696,9 +1695,10 @@

if (callback._set)
{
- callback.addStr(key.id());
- callback.addStr(key.name());
- callback.addStr(key.fingerprint());
+ GPGMap gpgmap(key);
+
+ callback.addMap(gpgmap.getMap());
+ callback.evaluate();
}
}

@@ -1708,9 +1708,10 @@

if (callback._set)
{
- callback.addStr(key.id());
- callback.addStr(key.name());
- callback.addStr(key.fingerprint());
+ GPGMap gpgmap(key);
+
+ callback.addMap(gpgmap.getMap());
+ callback.evaluate();
}
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/Callbacks_Register.cc
new/yast2-pkg-bindings-2.16.11/src/Callbacks_Register.cc
--- old/yast2-pkg-bindings-2.16.10/src/Callbacks_Register.cc 2008-01-03
16:05:59.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/Callbacks_Register.cc 2008-01-17
13:03:20.000000000 +0100
@@ -19,7 +19,7 @@
*/

/*
- File: $Id: Callbacks_Register.cc 43261 2008-01-03 15:05:57Z lslezak $
+ File: $Id: Callbacks_Register.cc 43700 2008-01-17 12:03:20Z lslezak $
Author: Ladislav Slezák <lslezak@xxxxxxxxxx>
Summary: Functions for registering YCP callbacks from Yast
Namespace: Pkg
@@ -68,7 +68,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, string
keydetails)</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(map<string,any> key)</code>. The callback function
should ask user whether the key is trusted, returned true value means the key
is trusted.
* @return void
*/
YCPValue PkgFunctions::CallbackImportGpgKey( const YCPString& args ) {
@@ -88,7 +88,7 @@
/**
* @builtin CallbackAcceptNonTrustedGpgKey
* @short Register callback function
- * @param string args Name of the callback handler function. Required callback
prototype is <code>boolean(string filename, string keyid, string keyname,
string fingerprint)</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, map<string,any> key)</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 PkgFunctions::CallbackAcceptNonTrustedGpgKey( const YCPString& args )
{
@@ -118,7 +118,7 @@
/**
* @builtin CallbackAcceptVerificationFailed
* @short Register callback function
- * @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 unsigned
file 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, map<string,any> key)</code>. The
callback function should ask user whether the unsigned file can be accepted,
returned true value means to accept the file.
* @return void
*/
YCPValue PkgFunctions::CallbackAcceptVerificationFailed( const YCPString& args
) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/GPGMap.cc
new/yast2-pkg-bindings-2.16.11/src/GPGMap.cc
--- old/yast2-pkg-bindings-2.16.10/src/GPGMap.cc 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/GPGMap.cc 2008-01-17
13:04:42.000000000 +0100
@@ -0,0 +1,63 @@
+/*
------------------------------------------------------------------------------
+ * Copyright (c) 2008 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it
under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
find
+ * current contact information at www.novell.com.
+ *
------------------------------------------------------------------------------
+ */
+
+/*
+ File: $Id$
+ Author: Ladislav Slezák <lslezak@xxxxxxxxxx>
+ Summary: Class for converting zypp::PublicKey to YCPMap
+*/
+
+#include "GPGMap.h"
+#include "i18n.h"
+
+#include <ycp/YCPString.h>
+#include <ycp/YCPInteger.h>
+#include <ycp/YCPBoolean.h>
+
+#include <zypp/Date.h>
+#include <zypp/PublicKey.h>
+
+/*
+ Textdomain "pkg-bindings"
+*/
+
+GPGMap::GPGMap(const zypp::PublicKey &key)
+{
+ gpg_map->add(YCPString("id"), YCPString(key.id()));
+ gpg_map->add(YCPString("name"), YCPString(key.name()));
+ gpg_map->add(YCPString("fingerprint"), YCPString(key.fingerprint()));
+ gpg_map->add(YCPString("path"), YCPString(key.path().asString()));
+
+ zypp::Date date(key.created());
+ // %x = date only, see man strftime
+ gpg_map->add(YCPString("created"), YCPString(date.form("%x")));
+ gpg_map->add(YCPString("created_raw"),
YCPInteger(zypp::Date::ValueType(date)));
+
+ date = key.expires();
+ std::string expires((date == 0) ? _("Never") : date.form("%x"));
+ gpg_map->add(YCPString("expires"), YCPString(expires));
+ gpg_map->add(YCPString("expires_raw"),
YCPInteger(zypp::Date::ValueType(date)));
+}
+
+void GPGMap::setTrusted(bool trusted)
+{
+ // is the key trusted?
+ gpg_map->add(YCPString("trusted"), YCPBoolean(trusted));
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/GPGMap.h
new/yast2-pkg-bindings-2.16.11/src/GPGMap.h
--- old/yast2-pkg-bindings-2.16.10/src/GPGMap.h 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/src/GPGMap.h 2008-01-16 16:04:32.000000000
+0100
@@ -0,0 +1,51 @@
+/*
------------------------------------------------------------------------------
+ * Copyright (c) 2008 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it
under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
find
+ * current contact information at www.novell.com.
+ *
------------------------------------------------------------------------------
+ */
+
+/*
+ File: $Id$
+ Author: Ladislav Slezák <lslezak@xxxxxxxxxx>
+ Summary: Class for converting zypp::PublicKey to YCPMap
+*/
+
+namespace zypp
+{
+ class PublicKey;
+}
+
+#include <ycp/YCPMap.h>
+
+class GPGMap
+{
+ public:
+
+ GPGMap(const zypp::PublicKey &key);
+
+ void setTrusted(bool trusted);
+
+ YCPMap getMap() const
+ {
+ return gpg_map;
+ }
+
+ private:
+
+ YCPMap gpg_map;
+};
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/Keyring.cc
new/yast2-pkg-bindings-2.16.11/src/Keyring.cc
--- old/yast2-pkg-bindings-2.16.10/src/Keyring.cc 2008-01-14
17:19:31.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/Keyring.cc 2008-01-17
13:04:18.000000000 +0100
@@ -22,19 +22,18 @@
#include <set>

#include "PkgFunctions.h"
+#include "GPGMap.h"
#include "log.h"

#include <ycp/YCPVoid.h>
#include <ycp/YCPBoolean.h>
#include <ycp/YCPString.h>
#include <ycp/YCPList.h>
-#include <ycp/YCPMap.h>
#include <ycp/YCPInteger.h>

#include <zypp/KeyRing.h>
#include <zypp/PublicKey.h>
#include <zypp/Pathname.h>
-#include <zypp/Date.h>

/*
Textdomain "pkg-bindings"
@@ -48,7 +47,7 @@
*
* @param string filename Path to the key file
* @param boolean trusted Set to true if the key is trusted
- * @return void
+ * @return boolean true on success
**/
YCPValue
PkgFunctions::ImportGPGKey(const YCPString& filename, const YCPBoolean&
trusted)
@@ -68,45 +67,12 @@
catch (...)
{
y2error("Key %s: Import failed", file.c_str());
+ return YCPBoolean(false);
}

- return YCPVoid();
+ return YCPBoolean(true);
}

-class GPGMap
-{
- public:
-
- GPGMap(const zypp::PublicKey &key, bool trusted)
- {
- gpg_map->add(YCPString("id"), YCPString(key.id()));
- gpg_map->add(YCPString("name"), YCPString(key.name()));
- gpg_map->add(YCPString("fingerprint"),
YCPString(key.fingerprint()));
-
- // is the key trusted?
- gpg_map->add(YCPString("trusted"), YCPBoolean(trusted));
-
- zypp::Date date(key.created());
- // %x = date only, see man strftime
- gpg_map->add(YCPString("created"), YCPString(date.form("%x")));
- gpg_map->add(YCPString("created_raw"),
YCPInteger(zypp::Date::ValueType(date)));
-
- date = key.expires();
- std::string expires((date == 0) ? _("Never") : date.form("%x"));
- gpg_map->add(YCPString("expires"), YCPString(expires));
- gpg_map->add(YCPString("expires_raw"),
YCPInteger(zypp::Date::ValueType(date)));
- }
-
- YCPMap getMap() const
- {
- return gpg_map;
- }
-
- private:
-
- YCPMap gpg_map;
-};
-
// A helper class
// converts PublicKey to YCPMap and adds it to an YCPList
class PublicKeyAdder : public std::unary_function<const zypp::PublicKey &,
void>
@@ -121,7 +87,8 @@

void operator() (const zypp::PublicKey &key)
{
- GPGMap gpgmap(key, trusted);
+ GPGMap gpgmap(key);
+ gpgmap.setTrusted(trusted);

return list->add(gpgmap.getMap());
}
@@ -217,7 +184,7 @@
{
zypp::PublicKey key(keyfile->value());

- GPGMap gpgmap(key, false);
+ GPGMap gpgmap(key);
return gpgmap.getMap();
}
catch(...)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/Makefile.am
new/yast2-pkg-bindings-2.16.11/src/Makefile.am
--- old/yast2-pkg-bindings-2.16.10/src/Makefile.am 2008-01-07
16:10:47.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/Makefile.am 2008-01-15
15:26:04.000000000 +0100
@@ -3,12 +3,12 @@
#

# -Woverloaded-virtual catches mis-overridden callbacks
-AM_CXXFLAGS = -DY2LOG=\"wfm\" \
+AM_CXXFLAGS = -DY2LOG=\"Pkg\" \
-DSUSEVERSION=\"${SUSEVERSION}\" \
-DLOCALEDIR=\"${localedir}\" \
-fno-inline \
-Woverloaded-virtual \
- -DZYPP_BASE_LOGGER_LOGGROUP=\"pkgbindings\"
+ -DZYPP_BASE_LOGGER_LOGGROUP=\"Pkg\"


# to look for the packagemanager in the prefix first (really first?)
@@ -44,7 +44,7 @@
Source_Resolvables.cc \
Source_Save.cc \
Source_Set.cc \
- Keyring.cc \
+ Keyring.cc GPGMap.cc GPGMap.h \
Callbacks.h \
Callbacks.YCP.h Callbacks.YCP.cc \
Callbacks.cc Callbacks_Register.cc \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/Makefile.in
new/yast2-pkg-bindings-2.16.11/src/Makefile.in
--- old/yast2-pkg-bindings-2.16.10/src/Makefile.in 2008-01-14
17:21:16.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/Makefile.in 2008-01-17
13:06:03.000000000 +0100
@@ -65,8 +65,8 @@
Source_Callbacks.lo Source_Create.lo Source_Download.lo \
Source_Get.lo Source_Installation.lo Source_Load.lo \
Source_Misc.lo Source_Resolvables.lo Source_Save.lo \
- Source_Set.lo Keyring.lo Callbacks.YCP.lo Callbacks.lo \
- Callbacks_Register.lo Y2PkgFunction.lo YRepo.lo
+ Source_Set.lo Keyring.lo GPGMap.lo Callbacks.YCP.lo \
+ Callbacks.lo Callbacks_Register.lo Y2PkgFunction.lo YRepo.lo
libpy2Pkg_la_OBJECTS = $(am_libpy2Pkg_la_OBJECTS)
libpy2Pkg_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -250,12 +250,12 @@
ystartupdir = @ystartupdir@

# -Woverloaded-virtual catches mis-overridden callbacks
-AM_CXXFLAGS = -DY2LOG=\"wfm\" \
+AM_CXXFLAGS = -DY2LOG=\"Pkg\" \
-DSUSEVERSION=\"${SUSEVERSION}\" \
-DLOCALEDIR=\"${localedir}\" \
-fno-inline \
-Woverloaded-virtual \
- -DZYPP_BASE_LOGGER_LOGGROUP=\"pkgbindings\"
+ -DZYPP_BASE_LOGGER_LOGGROUP=\"Pkg\"


# to look for the packagemanager in the prefix first (really first?)
@@ -289,7 +289,7 @@
Source_Resolvables.cc \
Source_Save.cc \
Source_Set.cc \
- Keyring.cc \
+ Keyring.cc GPGMap.cc GPGMap.h \
Callbacks.h \
Callbacks.YCP.h Callbacks.YCP.cc \
Callbacks.cc Callbacks_Register.cc \
@@ -380,6 +380,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Callbacks.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Callbacks.YCP.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/Callbacks_Register.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GPGMap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Keyring.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Locale.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Package.Plo@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/src/PkgFunctions.h
new/yast2-pkg-bindings-2.16.11/src/PkgFunctions.h
--- old/yast2-pkg-bindings-2.16.10/src/PkgFunctions.h 2008-01-10
14:08:11.000000000 +0100
+++ new/yast2-pkg-bindings-2.16.11/src/PkgFunctions.h 2008-01-15
12:45:51.000000000 +0100
@@ -687,7 +687,7 @@
YCPValue IsAnyResolvable(const YCPSymbol& kind_r, const YCPSymbol&
status);

// keyring related
- /* TYPEINFO: void(string,boolean)*/
+ /* TYPEINFO: boolean(string,boolean)*/
YCPValue ImportGPGKey(const YCPString& filename, const YCPBoolean&
trusted);
/* TYPEINFO: list<map<string,any>>(boolean)*/
YCPValue GPGKeys(const YCPBoolean& trusted);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-pkg-bindings-2.16.10/VERSION
new/yast2-pkg-bindings-2.16.11/VERSION
--- old/yast2-pkg-bindings-2.16.10/VERSION 2008-01-14 16:33:10.000000000
+0100
+++ new/yast2-pkg-bindings-2.16.11/VERSION 2008-01-17 13:01:58.000000000
+0100
@@ -1 +1 @@
-2.16.10
+2.16.11


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



Remember to have fun...

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

< Previous Next >