Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 18 Jan 2008 01:37:25 +0100
  • Message-id: <20080118003726.55DD1678335@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Fri Jan 18 01:37:25 CET 2008.

--------
--- yast2-packager/yast2-packager.changes 2008-01-14 17:32:38.000000000
+0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes
2008-01-17 13:50:47.074020000 +0100
@@ -1,0 +2,22 @@
+Thu Jan 17 13:43:42 CET 2008 - lslezak@xxxxxxx
+
+- use a `BusyIndicator widget instead of the animated icon
+- use a map parameter in the GPG key related callbacks,
+ display created and expiration dates in the popups,
+ display a warning if the key is expired
+- implemented AcceptWrongDigest and AcceptUnknownDigest callbacks
+- 2.16.15
+
+-------------------------------------------------------------------
+Wed Jan 16 15:21:17 CET 2008 - locilka@xxxxxxx
+
+- Always use ProvideOptionalFile for downloading the Release Notes
+ (#352887).
+
+-------------------------------------------------------------------
+Tue Jan 15 13:49:28 CET 2008 - lslezak@xxxxxxx
+
+- write key manager configuration, display/edit only trusted keys
+ (untrusted keys have no storage and will be lost at exit)
+
+-------------------------------------------------------------------

Old:
----
yast2-packager-2.16.14.tar.bz2

New:
----
yast2-packager-2.16.15.tar.bz2

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
++++ 3361 lines (skipped)
++++ between yast2-packager/yast2-packager.spec
++++ and /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.spec

++++++ yast2-packager-2.16.14.tar.bz2 -> yast2-packager-2.16.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/configure
new/yast2-packager-2.16.15/configure
--- old/yast2-packager-2.16.14/configure 2008-01-14 17:30:30.000000000
+0100
+++ new/yast2-packager-2.16.15/configure 2008-01-17 13:49:22.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-packager 2.16.14.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.15.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.14'
-PACKAGE_STRING='yast2-packager 2.16.14'
+PACKAGE_VERSION='2.16.15'
+PACKAGE_STRING='yast2-packager 2.16.15'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.14 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.16.15 to adapt to many kinds of
systems.

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

@@ -1268,7 +1268,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.16.14:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.15:";;
esac
cat <<\_ACEOF

@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.14
+yast2-packager configure 2.16.15
generated by GNU Autoconf 2.61

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

$ $0 $@
@@ -2181,7 +2181,7 @@

# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.16.14'
+ VERSION='2.16.15'


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



-VERSION="2.16.14"
+
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"

@@ -3303,7 +3304,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.16.14, which was
+This file was extended by yast2-packager $as_me 2.16.15, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.14
+yast2-packager config.status 2.16.15
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-packager-2.16.14/configure.in
new/yast2-packager-2.16.15/configure.in
--- old/yast2-packager-2.16.14/configure.in 2008-01-14 17:30:26.000000000
+0100
+++ new/yast2-packager-2.16.15/configure.in 2008-01-17 13:49:18.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
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-packager, 2.16.14, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.15, http://bugs.opensuse.org/, yast2-packager)
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.14"
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/COPYRIGHT.english
new/yast2-packager-2.16.15/COPYRIGHT.english
--- old/yast2-packager-2.16.14/COPYRIGHT.english 2008-01-14
17:30:47.000000000 +0100
+++ new/yast2-packager-2.16.15/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-packager-2.16.14/Makefile.am
new/yast2-packager-2.16.15/Makefile.am
--- old/yast2-packager-2.16.14/Makefile.am 2008-01-14 17:30:26.000000000
+0100
+++ new/yast2-packager-2.16.15/Makefile.am 2008-01-17 13:49:18.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-packager-2.16.14/Makefile.in
new/yast2-packager-2.16.15/Makefile.in
--- old/yast2-packager-2.16.14/Makefile.in 2008-01-14 17:30:32.000000000
+0100
+++ new/yast2-packager-2.16.15/Makefile.in 2008-01-17 13:49:24.000000000
+0100
@@ -217,11 +217,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-packager-2.16.14/README
new/yast2-packager-2.16.15/README
--- old/yast2-packager-2.16.14/README 2008-01-14 17:30:47.000000000 +0100
+++ new/yast2-packager-2.16.15/README 2008-01-17 13:50:31.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-packager-2.16.14/src/clients/key_manager.ycp
new/yast2-packager-2.16.15/src/clients/key_manager.ycp
--- old/yast2-packager-2.16.14/src/clients/key_manager.ycp 2008-01-10
13:18:19.000000000 +0100
+++ new/yast2-packager-2.16.15/src/clients/key_manager.ycp 2008-01-15
13:44:13.000000000 +0100
@@ -55,6 +55,11 @@
return `next;
}

+symbol Write()
+{
+ return KeyManager::Write() ? `next : `abort;
+}
+
// main function - start the workflow
symbol Main()
{
@@ -66,7 +71,7 @@
map<string,any> aliases = $[
"read" : ``(Read()),
"edit" : ``(RunGPGKeyMgmt(true)),
-// TODO "write" : Write()
+ "write" : ``(Write())
];

map sequence = $[
@@ -76,12 +81,12 @@
],
"edit" : $[
`abort : `abort,
+ `next : "write",
+ ],
+ "write" : $[
`next : `next,
+ `abort : `abort,
],
-// "write" : $[
-// `next : "summary",
-// `abort : `abort,
-// ],
];

y2milestone ("Starting the key management sequence");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/src/clients/repositories.ycp
new/yast2-packager-2.16.15/src/clients/repositories.ycp
--- old/yast2-packager-2.16.14/src/clients/repositories.ycp 2008-01-10
15:51:56.000000000 +0100
+++ new/yast2-packager-2.16.15/src/clients/repositories.ycp 2008-01-17
10:47:51.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 43535 2008-01-10 14:51:56Z lslezak $
+ * $Id: repositories.ycp 43693 2008-01-17 09:47:51Z lslezak $
*
*/

@@ -502,7 +502,6 @@
success = success && Pkg::SourceDelete(id);
});

-
foreach(map<string,any> src_state, sourceStatesOut,
{
if (src_state["do_refresh"]:false)
@@ -510,16 +509,16 @@
integer srcid = src_state["SrcId"]:-1;
y2milestone("Downloading metadata for source %1", srcid);

- Pkg::SourceRefreshNow(srcid);
+ success = success && Pkg::SourceRefreshNow(srcid);
}
}
);

+ success = success && KeyManager::Write();
+
// store in the persistent libzypp storage
success = success && Pkg::SourceSaveAll(); // #176013

- success = success && KeyManager::Write();
-
return success;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.14/src/include/key_manager_dialogs.ycp
new/yast2-packager-2.16.15/src/include/key_manager_dialogs.ycp
--- old/yast2-packager-2.16.14/src/include/key_manager_dialogs.ycp
2008-01-14 16:20:15.000000000 +0100
+++ new/yast2-packager-2.16.15/src/include/key_manager_dialogs.ycp
2008-01-15 13:42:31.000000000 +0100
@@ -56,8 +56,7 @@

map<string,any> r = $[
"id" : key["id"]:"",
- "table_descr" : [ key["trusted"]:false ? UI::Glyph (`CheckMark)
: "",
- key["id"]:"", key["name"]:"" ],
+ "table_descr" : [ key["id"]:"", key["name"]:"" ],
"rich_descr" :
WizardHW::CreateRichTextDescription(sformat(_("Key: %1"), key["id"]:""), descr)
];

@@ -86,53 +85,9 @@
// set the previously selected key
WizardHW::SetSelectedItem(selected_key);
}
-}

-/**
- * Display a dialog for editing the properties of the selected GPG key
- */
-boolean EditKeyProperties(map<string,any> key)
-{
- UI::OpenDialog(
- `MarginBox(1, 0.3,
- `VBox(
- `Frame(_("GPG Key Properties"),
- `VBox(
- `Left(`Label(sformat(_("Key ID: %1"), key["id"]:""))),
- `Left(`Label(sformat(_("Name: %1"), key["name"]:""))),
- `VSpacing(0.3),
- `Left(`CheckBox(`id(`trusted), _("&The Key is
Trusted"), key["trusted"]:false)),
- `VSpacing(0.2)
- )
- ),
- `VSpacing(0.2),
- `HBox(
- `PushButton(`id(`ok),`opt(`key_F10, `default),
Label::OKButton()),
- `HSpacing(2),
- `PushButton(`id(`cancel), `opt(`key_F9),
Label::CancelButton())
- )
- )
- )
- );
-
- symbol ui = (symbol)UI::UserInput();
- boolean ret = false;
-
- if (ui == `ok)
- {
- boolean new_value = (boolean)UI::QueryWidget(`id(`trusted), `Value);
- if (new_value != key["trusted"]:false)
- {
- key["trusted"] = new_value;
- KeyManager::ModifyKey(key);
- }
-
- ret = true;
- }
-
- UI::CloseDialog();
-
- return ret;
+ // properties of a key cannot be changed, disable Edit button
+ UI::ChangeWidget(`id(`edit), `Enabled, false);
}

// remember the details about the added key from AddGPGKey(),
@@ -168,15 +123,12 @@
`MarginBox(1, 0.3,
`VBox(
`HBox(
- `TextEntry(`id(`file), `opt(`notify,`immediate),
Label::FileName()),
+ `TextEntry(`id(`file), `opt(`notify),
Label::FileName()),
`VBox(
`Label(""),
`PushButton(`id(`browse), Label::BrowseButton())
)
- ),
- `VSpacing(0.2),
- `Left(`CheckBox(`id(`trusted), _("&The Key is Trusted"),
false)),
- `VSpacing(0.3)
+ )
)
)
),
@@ -264,8 +216,8 @@
continue;
}

- boolean trusted = (boolean) UI::QueryWidget(`id(`trusted), `Value);
- added_key = KeyManager::ImportFromFile(keyfile, trusted);
+ // always add as trusted
+ added_key = KeyManager::ImportFromFile(keyfile, true);

if (added_key == nil || size(added_key) == 0)
{
@@ -309,7 +261,7 @@
");

// table header
- WizardHW::CreateHWDialog(title, help_text, [_("Trusted"), _("Key ID"),
_("Name")], []);
+ WizardHW::CreateHWDialog(title, help_text, [_("Key ID"), _("Name")], []);

// set the navigation keys according to the current mode
if (gpg_mgr_standalone_mode)
@@ -340,18 +292,8 @@

y2milestone("Selected key: %1, action: %2", key_id, ret);

- // change key properties
- if (ret == `edit)
- {
- map<string,any> key = KeyManager::SearchGPGKey(key_id);
-
- if (key != nil && EditKeyProperties(key))
- {
- SetItems(key_id);
- }
- }
// remove the key
- else if (ret == `delete)
+ if (ret == `delete)
{
map<string,any> key = KeyManager::SearchGPGKey(key_id);

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.14/src/include/load_release_notes.ycp
new/yast2-packager-2.16.15/src/include/load_release_notes.ycp
--- old/yast2-packager-2.16.14/src/include/load_release_notes.ycp
2007-08-10 16:23:52.000000000 +0200
+++ new/yast2-packager-2.16.15/src/include/load_release_notes.ycp
2008-01-17 10:27:17.000000000 +0100
@@ -20,45 +20,48 @@
/* release notes */
string media_text = "";

-
// FIXME get rid of similar funciton in
instlalation/clients/release_notes_popup.ycp

/* function to load release notes */
define boolean load_release_notes (integer source_id)
{
string path_to_relnotes = "/docu";
+
string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf";
y2debug ("Path template: %1", path_templ);
+
+ // try 'en_UK' for 'en_UK'
string tmp = sformat (path_templ, Language::language);
y2debug ("Trying to get %1", tmp);
tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+
+ // try 'es' for 'es_ES'
if (tmp == nil)
{
tmp = sformat (path_templ, substring (Language::language, 0, 2));
y2debug ("Trying to get %1", tmp);
tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
}
+
+ // try 'en'
if (tmp == nil)
{
tmp = sformat (path_templ, "en");
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
}
+
+ // no other fallback
if (tmp == nil)
return false;

+ // read the release notes content
media_text = (string)SCR::Read (.target.string, [tmp, ""]);
if (media_text != "" && media_text != nil)
return true;
+
return false;
};

- string media_prefix =
-// beginning of the rich text with the release notes
-_("<p><b>These are the release notes made for the first initial release. They
are
-part of the installation media. During the configuration steps, if a connection
-to the Internet is available, you can download updated release notes
-from the SUSE Linux Web server.</b></p>");
-
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/src/modules/KeyManager.ycp
new/yast2-packager-2.16.15/src/modules/KeyManager.ycp
--- old/yast2-packager-2.16.14/src/modules/KeyManager.ycp 2008-01-14
16:21:47.000000000 +0100
+++ new/yast2-packager-2.16.15/src/modules/KeyManager.ycp 2008-01-15
13:38:14.000000000 +0100
@@ -24,7 +24,7 @@
list<map<string,any> > deleted_keys = [];

// keys to import from a file (file name => trusted flag)
-map<string,boolean> import_from_file = $[];
+list<map<string,any> > import_from_file = [];

boolean modified = false;

@@ -38,7 +38,7 @@
{
known_keys = [];
deleted_keys = [];
- import_from_file = $[];
+ import_from_file = [];
modified = false;
}

@@ -48,14 +48,8 @@
*/
list<map<string,any> > ReadCurrentKeys()
{
- // read known keys
- list<map<string,any> > ret = Pkg::GPGKeys(false);
-
- if (ret != nil)
- {
- // add trusted keys
- ret = (list<map<string,any> >)merge(ret, Pkg::GPGKeys(true));
- }
+ // read trusted keys
+ list<map<string,any> > ret = Pkg::GPGKeys(true);

y2milestone("Read configuration: %1", ret);

@@ -135,45 +129,18 @@
);

// import the new keys
- foreach(string tmpfile, boolean trusted, import_from_file,
+ foreach(map<string,any> new_key, import_from_file,
{
- y2milestone("Importing key from '%1', trusted: %2", tmpfile,
trusted);
+ y2milestone("Importing key %1 from '%2', trusted: %3",
new_key["id"]:"", new_key["file"]:"", new_key["trusted"]:false);

- ret = Pkg::ImportGPGKey(tmpfile, trusted) && ret;
+ ret = Pkg::ImportGPGKey(new_key["file"]:"",
new_key["trusted"]:false) && ret;
}
);

- // modify keys (change the trusted flag)
- // get the current settings
- list<map<string,any> > current_keys = ReadCurrentKeys();
- foreach(map<string,any> key, current_keys,
- {
- map<string,any> found_key = SearchGPGKey(key["id"]:"");
- // is the trusted flag different?
- if (found_key != nil && found_key["trusted"]:false !=
key["trusted"]:false)
- {
- y2milestone("Key %1 ('%2'): new trusted state: %3",
found_key["id"]:"",
- found_key["name"]:"", found_key["trusted"]:false);
-
- // the current state is trusted
- if (found_key["trusted"]:false)
- {
- // TODO move to the trusted keyring
- }
- else
- {
- // TODO move from the trusted keyring
- }
- }
- }
- );
-
-
// all changes are saved, reset them
- Reset();
-
- // update the current status
- Read();
+ deleted_keys = [];
+ import_from_file = [];
+ modified = false;

return ret;
}
@@ -197,33 +164,6 @@
}

/**
- * Modify a key
- * @param new_key A map with the key data, the key with the same Key ID is
modified. (Only "trusted" flag can be changed.)
- * @return true on success
- */
-global boolean ModifyKey(map<string,any> new_key)
-{
- boolean ret = true;
-
- if (new_key != nil)
- {
- // update the key
- known_keys = maplist(map<string,any> k, known_keys,
- {
- if (k["id"]:"" == new_key["id"]:"")
- {
- k["trusted"] = new_key["trusted"]:false;
- }
-
- return k;
- }
- );
- }
-
- return ret;
-}
-
-/**
* Delete the key from the package manager
* @param key_id ID of the key to delete
* @return boolean true on success
@@ -259,6 +199,20 @@
known_keys = remove(known_keys, found);
}

+ boolean found_in_imported = false;
+
+ // remove from imported keys (deleting a key scheduled for import)
+ import_from_file = filter(map<string,any> new_key, import_from_file,
+ {
+ boolean found_key = (new_key["id"]:"" == key_id);
+ found_in_imported = found_in_imported || found_key;
+
+ return found_key;
+ }
+ );
+
+ modified = true;
+
return (found != nil);
}

@@ -273,7 +227,7 @@
{
// check whether the file is valid, copy the file to the tmpdir
map<string,any> key = Pkg::CheckGPGKeyFile(file);
- y2internal("File content: %1", key);
+ y2milestone("File content: %1", key);

if (key != nil && size(key) > 0)
{
@@ -308,11 +262,29 @@
return nil;
}

+ boolean found_in_deleted = false;
+ // check if the key is scheduled for removal
+ deleted_keys = filter(map<string,any> deleted_key, deleted_keys,
+ {
+ boolean key_found = (deleted_key["id"]:"" == key["id"]:"");
+ found_in_deleted = found_in_deleted || key_found;
+
+ return !key_found;
+ }
+ );
+
+ // the key was known, move it to the known list
+ if (found_in_deleted)
+ {
+ known_keys = add(known_keys, key);
+ return key;
+ }
+
// copy the key to the temporary directory (in fact the keys are imported
in Write())
string tmpfile = sformat("%1/tmp_gpg_key.%2", Directory::tmpdir,
size(known_keys));
string command = sformat("/bin/cp -- '%1' '%2'", String::Quote(file),
String::Quote(tmpfile));

- y2internal("Copying the key: %1", command);
+ y2milestone("Copying the key: %1", command);

integer out = (integer)SCR::Execute(.target.bash, command);

@@ -323,11 +295,13 @@
}

// store the import request
- import_from_file = add(import_from_file, tmpfile, trusted);
+ import_from_file = add(import_from_file, $[ "file" : tmpfile, "trusted" :
trusted, "id" : key["id"]:"" ]);

// add the new key to the current config
known_keys = add(known_keys, key);

+ modified = true;
+
return key;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.14/src/modules/PackageCallbacks.ycp
new/yast2-packager-2.16.15/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.16.14/src/modules/PackageCallbacks.ycp 2008-01-04
11:18:20.000000000 +0100
+++ new/yast2-packager-2.16.15/src/modules/PackageCallbacks.ycp 2008-01-17
13:48:03.000000000 +0100
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 43268 2008-01-04 10:18:20Z lslezak $
+ * $Id: PackageCallbacks.ycp 43713 2008-01-17 12:48:02Z lslezak $
*
*/

@@ -35,9 +35,6 @@
global boolean _package_popup = false;
global boolean _script_popup = false;
global boolean _scan_popup = false;
- global string _tick_movie =
"/usr/share/YaST2/theme/current/animations/ticks-loop3.gif";
- global integer _tick_movie_x = 7;
- global integer _tick_movie_y = 1;
global string _package_name = "";
global integer _package_size = 0;
global boolean _deleting_package = false;
@@ -60,8 +57,6 @@
// max. length of the text in the repository popup window
integer max_size = 60;

- integer tick_time = 0;
-

//--------------------------------------------------------------------------
// defaults

@@ -2148,17 +2143,6 @@
}
else
{
- term progressw = `Empty();
- if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false )
- {
- progressw = `HVCenter(`MinSize( _tick_movie_x, _tick_movie_y,
`ReplacePoint(`id(`rp_progress), `Image(`id (`progress_widget),
`opt(`animated), _tick_movie, "progress_widget" ))));
- }
- else
- {
- string label = (tick_progress) ? tick_labels[current_tick]:"/" :
sformat("%1: %2", progress_task, val_raw);
- progressw = `ReplacePoint(`id(`rp_progress),
`Label(`id(`progress_widget), label));
- }
-
UI::OpenDialog(
`HBox(
`HSpacing(1),
@@ -2166,10 +2150,7 @@
`VSpacing(0.5),
`HSpacing(`id(`callback_progress_popup), max_size),
(in_percent) ? `ProgressBar (`id (`progress_widget),
task, 100, val_percent)
- : `VBox(
- `Label(task),
- progressw
- ),
+ : `BusyIndicator(`id(`progress_widget), task, 3000),
`VSpacing(0.2),
`PushButton (`id (`abort), Label::AbortButton ()),
`VSpacing(0.5)
@@ -2178,8 +2159,6 @@
)
);
}
-
- tick_time = 0;
}
}

@@ -2233,36 +2212,7 @@
{
if (tick_progress || val_progress)
{
- term progressw = `Empty();
- if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false )
- {
- progressw = `HVCenter(`MinSize( _tick_movie_x,
_tick_movie_y, `Image(`id (`progress_widget), `opt(`animated), _tick_movie,
"progress_widget" )));
- }
- else
- {
- string label = (tick_progress) ?
tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw);
- progressw = `Label(`id(`progress_widget), label);
- }
-
- // restart the animation only when at least 3 seconds elapsed,
- // don't restart it too often
- integer tm = time();
- y2debug("Time elapsed since the last tick callback: %1", tm -
tick_time);
- if (tm - tick_time > 3 ||
!UI::GetDisplayInfo()["HasAnimationSupport"]:true)
- {
- UI::ReplaceWidget (`id(`rp_progress), progressw );
- tick_time = tm;
- }
- else
- {
- y2debug("Ignoring the tick callback");
- }
-
-
- if (tick_progress)
- {
- NextTick();
- }
+ UI::ChangeWidget(`id(`progress_widget), `Alive, true);
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/src/modules/Packages.ycp
new/yast2-packager-2.16.15/src/modules/Packages.ycp
--- old/yast2-packager-2.16.14/src/modules/Packages.ycp 2007-12-10
15:48:06.000000000 +0100
+++ new/yast2-packager-2.16.15/src/modules/Packages.ycp 2008-01-17
10:27:17.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: Packages.ycp 42900 2007-12-10 14:48:05Z lslezak $
+ * $Id: Packages.ycp 43664 2008-01-16 14:25:15Z locilka $
*/

{
@@ -1008,7 +1008,11 @@

if (load_release_notes (source))
{
- SlideShow::relnotes = media_prefix + media_text;
+ // TRANSLATORS: beginning of the rich text with the release notes
+ SlideShow::relnotes = _("<p><b>These are the release notes made for the
first initial release. They are
+part of the installation media. During the configuration steps, if a connection
+to the Internet is available, you can download updated release notes
+from the SUSE Linux Web server.</b></p>") + media_text;
}
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.14/src/modules/SignatureCheckCallbacks.ycp
new/yast2-packager-2.16.15/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.16.14/src/modules/SignatureCheckCallbacks.ycp
2007-07-19 13:22:39.000000000 +0200
+++ new/yast2-packager-2.16.15/src/modules/SignatureCheckCallbacks.ycp
2008-01-17 09:06:51.000000000 +0100
@@ -19,7 +19,7 @@
* Default return when signatures shouldn't be checked
* @see SignatureCheckDialogs::CheckSignaturesInYaST()
*/
- boolean default_return_unchecked = true;
+ const boolean default_return_unchecked = true;

/* ============================ < Callbacks for Repositories >
============================ */

@@ -75,6 +75,53 @@
}
}

+
+/**
+ * Callback handler function. Required callback prototype is
<code>boolean(string filename, string requested_digest, string
found_digest)</code>. The callback function should ask user whether the wrong
digest can be accepted, returned true value means to accept the file.
+ * @return boolean
+ */
+ // zypp: askUserToAcceptWrongDigest
+ global boolean AcceptWrongDigest(string filename, string requested_digest,
string found_digest)
+ {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
+ const string dont_show_dialog_ident = "-AcceptWrongDigest-";
+
+ // Show the popup?
+ if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident,
filename)) {
+ return SignatureCheckDialogs::UseFileWithWrongDigest(filename,
requested_digest, found_digest, dont_show_dialog_ident);
+ } else {
+ // Return the default value entered by user
+ return
SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename);
+ }
+ }
+
+/**
+ * Callback handler function. Required callback prototype is
<code>boolean(string filename, string name)</code>. The callback function
should ask user whether the uknown digest can be accepted, returned true value
means to accept the digest.
+ * @return boolean
+ */
+
+ // zypp: askUserToAccepUnknownDigest
+ global boolean AcceptUnknownDigest(string filename, string digest)
+ {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
+ const string dont_show_dialog_ident = "-AcceptUnknownDigest-";
+
+ // Show the popup?
+ if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident,
filename)) {
+ return SignatureCheckDialogs::UseFileWithUnknownDigest(filename,
digest, dont_show_dialog_ident);
+ } else {
+ // Return the default value entered by user
+ return
SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident, filename);
+ }
+ }
+
+
// Name of the callback handler function. Required callback prototype is
// boolean(string filename, string keyid, string keyname). The callback
// function should ask user whether the unknown key can be accepted,
returned
@@ -103,55 +150,58 @@
}

// Name of the callback handler function. Required callback prototype is
- // boolean(string keyid, string keyname, string keydetails). The callback
+ // boolean(map<string,any> key). The callback
// function should ask user whether the key is trusted, returned true value
// means the key is trusted.
//
// zypp: askUserToTrustKey
//
/* function for CallbackTrustGpgKey() */
- global boolean TrustGpgKey (string filename, string keyid, string keyname,
string fingerprint) {
+ global boolean TrustGpgKey (map<string,any> key)
+ {
// 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;
+ return SignatureCheckDialogs::ImportGPGKeyDialog(key) == `import;
}

// Name of the callback handler function. Required callback prototype is
- // boolean(string keyid, string keyname, string keydetails). The callback
+ // boolean(map<string,any> key). 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) {
+ global boolean ImportGpgKey (map<string,any> key)
+ {
// 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::ImportGPGKeyIntoTrustedDialog(keyid,
keyname, fingerprint);
+ return SignatureCheckDialogs::ImportGPGKeyIntoTrustedDialog(key);
}

// Name of the callback handler function. Required callback prototype is
- // boolean(string filename, string keyid, string keyname). The callback
+ // boolean(string filename, map<string,any> key). The callback
// function should ask user whether the unsigned file can be accepted,
// returned true value means to accept the file.
//
// zypp: askUserToAcceptVerificationFailed
//
/* function for CallbackAcceptVerificationFailed() */
- global boolean AcceptVerificationFailed (string filename, string keyid,
string keyname, string fingerprint) {
+ global boolean AcceptVerificationFailed (string filename, map<string,any>
key)
+ {
// Check signatures at all?
if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
return default_return_unchecked;

- return SignatureCheckDialogs::UseCorruptedItem(`file, filename, keyid,
keyname, fingerprint);
+ return SignatureCheckDialogs::UseCorruptedItem(`file, filename, key);
}
-
+
/* ============================ < Callbacks for Repositories >
============================ */

// Name of the callback handler function. Required callback prototype is
void
@@ -159,8 +209,9 @@
// that a trusted key has been added.
//
/* function for CallbackTrustedKeyAdded() */
- void TrustedKeyAdded (string keyring, string keyid, string keyname, string
fingerprint) {
- y2milestone("Trusted key has been added: %1 / %2 (%3)", keyid,
fingerprint, keyname);
+ void TrustedKeyAdded (map<string,any> key)
+ {
+ y2milestone("Trusted key has been added: %1 / %2 (%3)", key["id"]:"",
key["fingerprint"]:"", key["name"]:"");
return nil;
}

@@ -169,8 +220,9 @@
// that a trusted key has been removed.
//
/* function for CallbackTrustedKeyRemoved() */
- void TrustedKeyRemoved (string keyring, string keyid, string keyname,
string fingerprint) {
- y2milestone("Trusted key has been removed: %1 / %2 (%3)", keyid,
fingerprint, keyname);
+ void TrustedKeyRemoved (map<string,any> key)
+ {
+ y2milestone("Trusted key has been removed: %1 / %2 (%3)", key["id"]:"",
key["fingerprint"]:"", key["name"]:"");
return nil;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.14/src/modules/SignatureCheckDialogs.ycp
new/yast2-packager-2.16.15/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.16.14/src/modules/SignatureCheckDialogs.ycp
2007-07-19 13:22:39.000000000 +0200
+++ new/yast2-packager-2.16.15/src/modules/SignatureCheckDialogs.ycp
2008-01-17 10:09:03.000000000 +0100
@@ -459,18 +459,30 @@
return ret;
}

+ string GPGKeyAsString(map<string,any> key)
+ {
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key ID
+ return sformat(_("ID: %1"), key["id"]:"") + "\n" +
+ ((key["fingerprint"]:"" == nil || key["fingerprint"]:"" == "") ?
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key
fingerprint
+ "" : sformat(_("Fingerprint: %1") + "\n",
StringSplitter(key["fingerprint"]:"", " ", 4))) +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key name
+ sformat(_("Name: %1"), key["name"]:"")
+ + (key["created"]:"" != "" ? "\n" + sformat(_("Created: %1"),
key["created"]:"") : "")
+ + (key["expires"]:"" != "" ? "\n" + sformat(_("Expires: %1"),
key["expires"]:"") : "");
+ }
+
/**
* Used for corrupted file or package. Opens dialog asking whether user
wants
* to use this corrupted item.
*
* @param symbol item_type `file or `package
* @param string item_name file name or package name
- * @param string key_id
- * @param string key_name
- * @param string fingerprint
+ * @param map key Used key
* @return boolean use or don't use ('true' if 'yes')
*/
- global boolean UseCorruptedItem (symbol item_type, string item_name,
string key_id, string key_name, string fingerprint) {
+ global boolean UseCorruptedItem (symbol item_type, string item_name,
map<string,any> key)
+ {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the
complete description of the GnuPG key (multiline)
_("Package %1 is signed with the following GnuPG key, but the
integrity check failed: %2
@@ -492,14 +504,7 @@
Use it anyway?")
),
item_name,
- "\n\n" +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key ID
- sformat(_("ID: %1"), key_id) + "\n" +
- ((fingerprint == nil || fingerprint == "") ?
- // Part of the GnuPG key description in popup, %1 is a
GnuPG key fingerprint
- "" : sformat(_("Fingerprint: %1") + "\n",
StringSplitter(fingerprint, " ", 4))) +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key name
- sformat(_("Name: %1"), key_name)
+ "\n\n" + GPGKeyAsString(key)
);

UI::OpenDialog(
@@ -611,7 +616,8 @@
* @param string key_name
* @return symbol `key_import, `install, `skip
*/
- global symbol ItemSignedWithPublicSignature (symbol item_type, string
item_name, string key_id, string key_name) {
+ global symbol ItemSignedWithPublicSignature (symbol item_type, string
item_name, map<string,any> key)
+ {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the key
ID, %3 for the key name
_("The package %1 is digitally signed
@@ -634,7 +640,7 @@
Installing a file from an unknown repository can put
the integrity of your system at risk. It is safest
to skip it.")
- ), item_name, key_id, key_name);
+ ), item_name, key["id"]:"", key["name"]:"");

UI::OpenDialog(
`opt(`decorated),
@@ -663,7 +669,7 @@
// later, if asking whether to import the key, the key is trusted
// so it will be also imported
// bugzilla #282254
- list_of_trusted_keys = add (list_of_trusted_keys, key_id);
+ list_of_trusted_keys = add (list_of_trusted_keys, key["id"]:"");
}

UI::CloseDialog();
@@ -679,7 +685,8 @@
* @param string key_fingerprint
* @return symbol
*/
- global symbol ImportGPGKeyDialog (string key_id, string key_name, string
key_location, string fingerprint) {
+ global symbol ImportGPGKeyDialog (map<string,any> key)
+ {
// 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
@@ -690,7 +697,24 @@
// additional Richtext (HTML) warning text (kind of help), 2/2, %1
stands for the GnuPG key ID
sformat(_("<p>A warning dialog opens for every package that
is not signed by a trusted (imported) key. If you do not import the key,
-packages created by the owner of key <tt>%1</tt> show this warning.</p>"),
key_id);
+packages created by the owner of key <tt>%1</tt> show this warning.</p>"),
key["id"]:"");
+
+ // expiration warning
+ string exp_str = "";
+
+ integer expires = key["expires_raw"]:0;
+ if (expires > 0 && time() > expires)
+ {
+ // %x = date only (without time)
+ map out = (map)SCR::Execute(.target.bash_output, "date +%x");
+ string current_date = out["stdout"]:"";
+ y2milestone( "Current date: %1", current_date);
+
+ // warning label - the key to import is expired
+ // %1 is current date (formatted according to the current locale)
+ exp_str = "\n" + sformat(_("WARNING: The key is expired!
+Current date: %1"), current_date);
+ }

// popup message, %1 stands for GPG key complete multiline description,
%2 for key location (URL or ...)
string dialog_text = sformat(_("The GnuPG key %1
@@ -701,14 +725,8 @@
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
"\n" +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key ID
- sformat(_("ID: %1"), key_id) + "\n" +
- ((fingerprint == nil || fingerprint == "") ?
- // Part of the GnuPG key description in popup, %1 is a
GnuPG key fingerprint
- "" : sformat(_("Fingerprint: %1") + "\n",
StringSplitter(fingerprint, " ", 4))) +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key name
- sformat(_("Name: %1"), key_name),
- key_location
+ GPGKeyAsString(key) + exp_str,
+ key["path"]:""
);

UI::OpenDialog(
@@ -767,6 +785,13 @@
// else if (ret == `details)
Popup::LongMessage(key_detailed_description);
}

+ if (ret == `import) {
+ // later, if asking whether to import the key, the key is trusted
+ // so it will be also imported
+ // bugzilla #282254
+ list_of_trusted_keys = add (list_of_trusted_keys, key["id"]:"");
+ }
+
UI::CloseDialog();
return ret;
}
@@ -779,10 +804,11 @@
* @param string fingerprint
* @return boolean whether zypp should import the key into the keyring of
trusted keys
*/
- global boolean ImportGPGKeyIntoTrustedDialog (string key_id, string
key_name, string fingerprint) {
+ global boolean ImportGPGKeyIntoTrustedDialog (map<string,any> key)
+ {
// bugzilla #282254
- if (key_id != "" && key_id != nil && contains (list_of_trusted_keys,
key_id)) {
- y2milestone ("Key '%1' is trusted, importing...", key_id);
+ if (key["id"]:"" != "" && key["id"]:"" != nil && contains
(list_of_trusted_keys, key["id"]:"")) {
+ y2milestone ("Key '%1' is trusted, importing...", key["id"]:"");
return true;
}

@@ -796,7 +822,7 @@
// additional Richtext (HTML) warning text (kind of help), 2/2, %1
stands for the GnuPG key ID
sformat(_("<p>A warning dialog opens for every package that
is not signed by a trusted (imported) key. If you do not import the key,
-packages created by the owner of key <tt>%1</tt> show this warning.</p>"),
key_id);
+packages created by the owner of key <tt>%1</tt> show this warning.</p>"),
key["id"]:"");

// popup message, %1 stands for string "GPG key ID\nfingerprint", %2
for key name
string dialog_text = sformat(_("The following GnuPG key has been found:
%1
@@ -806,13 +832,7 @@
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
"\n" +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key ID
- sformat(_("ID: %1"), key_id) + "\n" +
- ((fingerprint == nil || fingerprint == "") ?
- // Part of the GnuPG key description in popup, %1 is a
GnuPG key fingerprint
- "" : sformat(_("Fingerprint: %1") + "\n",
StringSplitter(fingerprint, " ", 4))) +
- // Part of the GnuPG key description in popup, %1 is a GnuPG
key name
- sformat(_("Name: %1"), key_name)
+ GPGKeyAsString(key)
);

UI::OpenDialog(
@@ -875,4 +895,99 @@

return ret == `import;
}
+
+ boolean RunSimpleErrorPopup(string heading, string description_text,
+ string dont_show_dialog_ident, string dont_show_dialog_param)
+ {
+ UI::OpenDialog(
+ `opt(`decorated),
+ `VBox(
+ // popup heading
+ `HBox (
+ `VCenter(MessageIcon("error")),
+ // dialog heading - displayed in a big bold font
+ `VCenter(`Heading(heading)),
+ `HStretch()
+ ),
+ `MarginBox(0.5, 0.5, `Label(description_text)),
+ `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again),
+ Message::DoNotShowMessageAgain(),
+ (GetShowThisPopup(dont_show_dialog_ident,
dont_show_dialog_param) ? false:true)
+ ))),
+ YesNoButtons(`no)
+ )
+ );
+
+ boolean ret = WaitForYesNoCancelUserInput();
+ // default value
+ if (ret == nil) ret = false;
+
+ // Store the don't show value, store the default return value
+ HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident,
`dont_show_again, dont_show_dialog_param);
+
+ UI::CloseDialog();
+
+ return ret;
+ }
+
+ /**
+ * Ask user to accept wrong digest
+ * @param filename Name of the file
+ * @param requested_digest Expected checksum
+ * @param found_digest Current checksum
+ * @param dont_show_dialog_ident Uniq ID for "don't show again"
+ * @return boolean true when user accepts the file
+ */
+ global boolean UseFileWithWrongDigest(string filename, string
requested_digest, string found_digest, string dont_show_dialog_ident)
+ {
+ const string description_text =
+ // popup question, %1 stands for the filename, %2 is expected
checksum
+ // %3 is the current checksum (e.g.
"803a8ff00d00c9075a1bd223a480bcf92d2481c1")
+ sformat(_("The expected checksum of file %1
+is %2,
+but the current checksum is %3.
+
+This means that the file has been changed by accident or by an attacker
+since the repository creator signed it. Using it is a big risk
+for the integrity and security of your system.
+
+Use it anyway?"),
+ filename,
+ requested_digest,
+ found_digest
+ );
+
+ // dialog heading - displayed in a big bold font
+ const string heading = _("Wrong Digest");
+
+ return RunSimpleErrorPopup(heading, description_text,
dont_show_dialog_ident, filename);
+ }
+
+ /**
+ * Ask user to accept a file with unknown checksum
+ * @param filename Name of the file
+ * @param digest Current checksum
+ * @param dont_show_dialog_ident Uniq ID for "don't show again"
+ * @return boolean true when user accepts the file
+ */
+ global boolean UseFileWithUnknownDigest(string filename, string digest,
string dont_show_dialog_ident)
+ {
+ const string description_text =
+ // popup question, %1 stands for the filename, %2 is expected
digest, %3 is the current digest
+ sformat(_("The checksum of file %1
+is %2,
+but the expected checksum is not known.
+
+This means that the origin and integrity of the file
+cannot be verified. Using the file may put the integrity of your system at
risk.
+
+Use it anyway?"),
+ filename,
+ digest
+ );
+ // dialog heading - displayed in a big bold font
+ const string heading = _("Unknown Digest");
+
+ return RunSimpleErrorPopup(heading, description_text,
dont_show_dialog_ident, filename);
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.14/VERSION
new/yast2-packager-2.16.15/VERSION
--- old/yast2-packager-2.16.14/VERSION 2008-01-14 17:29:07.000000000 +0100
+++ new/yast2-packager-2.16.15/VERSION 2008-01-17 13:45:10.000000000 +0100
@@ -1 +1 @@
-2.16.14
+2.16.15


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



Remember to have fun...

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

< Previous Next >