Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Jan 15 08:52:04 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-01-04 13:09:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-01-14 17:32:38.293172000 +0100
@@ -1,0 +2,12 @@
+Mon Jan 14 17:25:07 CET 2008 - lslezak@suse.cz
+
+- display details about the GPG key selected for import, UI fully
+ works, importing/removing a key works in Write()
+- 2.16.14
+
+-------------------------------------------------------------------
+Thu Jan 10 13:20:04 CET 2008 - lslezak@suse.cz
+
+- added preliminary support for GPG key management (FATE #300754)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.13.tar.bz2
New:
----
yast2-packager-2.16.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.g13304/_old 2008-01-15 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.g13304/_new 2008-01-15 08:50:58.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.13)
+# spec file for package yast2-packager (Version 2.16.14)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,23 +11,25 @@
# norootforbuild
Name: yast2-packager
-Version: 2.16.13
+Version: 2.16.14
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.13.tar.bz2
+Source0: yast2-packager-2.16.14.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# Progress::Subprogress*()
BuildRequires: yast2 >= 2.16.17
+# New functions: GPG key management
+BuildRequires: yast2-pkg-bindings >= 2.16.10
# Module: OneClickInstallStandard
Requires: perl-XML-Bare yast2-perl-bindings
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
Requires: yast2-installation >= 2.15.12
-# New function: Pkg::SourceProvideDirectory
-Requires: yast2-pkg-bindings >= 2.15.38
+# New functions: GPG key management
+Requires: yast2-pkg-bindings >= 2.16.10
# Progress::Subprogress*()
Requires: yast2 >= 2.16.17
# unzipping license file
@@ -63,7 +65,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.13
+%setup -n yast2-packager-2.16.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +101,12 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Mon Jan 14 2008 - lslezak@suse.cz
+- display details about the GPG key selected for import, UI fully
+ works, importing/removing a key works in Write()
+- 2.16.14
+* Thu Jan 10 2008 - lslezak@suse.cz
+- added preliminary support for GPG key management (FATE #300754)
* Fri Jan 04 2008 - lslezak@suse.cz
- PackageCallbacks: do not remove the subprogress widget, try to
reuse it later if possible (#350584)
++++++ yast2-packager-2.16.13.tar.bz2 -> yast2-packager-2.16.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.13/configure new/yast2-packager-2.16.14/configure
--- old/yast2-packager-2.16.13/configure 2008-01-04 13:08:29.000000000 +0100
+++ new/yast2-packager-2.16.14/configure 2008-01-14 17:30:30.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.13.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.14.
#
# 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.13'
-PACKAGE_STRING='yast2-packager 2.16.13'
+PACKAGE_VERSION='2.16.14'
+PACKAGE_STRING='yast2-packager 2.16.14'
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.13 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.16.14 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.13:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.14:";;
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.13
+yast2-packager configure 2.16.14
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.13, which was
+It was created by yast2-packager $as_me 2.16.14, 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.13'
+ VERSION='2.16.14'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.13"
+VERSION="2.16.14"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3303,7 +3303,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.13, which was
+This file was extended by yast2-packager $as_me 2.16.14, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.13
+yast2-packager config.status 2.16.14
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.13/configure.in new/yast2-packager-2.16.14/configure.in
--- old/yast2-packager-2.16.13/configure.in 2008-01-04 13:08:24.000000000 +0100
+++ new/yast2-packager-2.16.14/configure.in 2008-01-14 17:30:26.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.16.13, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.14, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.13"
+VERSION="2.16.14"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.13/src/clients/key_manager.ycp new/yast2-packager-2.16.14/src/clients/key_manager.ycp
--- old/yast2-packager-2.16.13/src/clients/key_manager.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.16.14/src/clients/key_manager.ycp 2008-01-10 13:18:19.000000000 +0100
@@ -0,0 +1,102 @@
+/**
+ * File: key_manager.ycp
+ *
+ * Author: Ladislav Slezak
+ *
+ * Purpose: Manages GPG keys in the package manager
+ *
+ * $Id$
+ */
+
+{
+textdomain "packager";
+
+import "PackageCallbacks";
+import "Wizard";
+import "Label";
+import "Report";
+import "CommandLine";
+import "Popup";
+import "PackageLock";
+import "KeyManager";
+import "Installation";
+import "Sequencer";
+
+include "packager/key_manager_dialogs.ycp";
+
+symbol Read()
+{
+ // TODO: the check dialog contains only [Continue] [Retry] buttons
+ // there is no [Abort] (#293356)
+ if (!PackageLock::Check())
+ {
+ // error message - SW management is already in use, access denied
+ // the yast module cannot be started
+ Report::Error(_("The GPG key management module cannot work
+without access to the software management system."));
+ Wizard::CloseDialog ();
+ return `abort;
+ }
+
+ // init the target - read the keys
+ if (!Pkg::TargetInitialize(Installation::destdir))
+ {
+ y2error("The target cannot be initialized, aborting...");
+ return `abort;
+ }
+
+ // read the current keys
+ if (!KeyManager::Read())
+ {
+ y2error("The key configuration cannot be read, aborting...");
+ return `abort;
+ }
+
+ return `next;
+}
+
+// main function - start the workflow
+symbol Main()
+{
+ Wizard::CreateDialog();
+ Wizard::SetDesktopIcon("sw_source");
+ // dialog caption
+ Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
+
+ map aliases = $[
+ "read" : ``(Read()),
+ "edit" : ``(RunGPGKeyMgmt(true)),
+// TODO "write" : Write()
+ ];
+
+ map sequence = $[
+ "ws_start" : "read",
+ "read" : $[
+ `next : "edit"
+ ],
+ "edit" : $[
+ `abort : `abort,
+ `next : `next,
+ ],
+// "write" : $[
+// `next : "summary",
+// `abort : `abort,
+// ],
+ ];
+
+ y2milestone ("Starting the key management sequence");
+ symbol ret = Sequencer::Run (aliases, sequence);
+
+ Wizard::CloseDialog ();
+ return ret;
+}
+
+map cmdline_description = $[
+ "id" : "key_mgmgt",
+ "guihandler" : Main
+];
+
+return CommandLine::Run(cmdline_description);
+
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.13/src/clients/repositories.ycp new/yast2-packager-2.16.14/src/clients/repositories.ycp
--- old/yast2-packager-2.16.13/src/clients/repositories.ycp 2007-11-28 16:11:57.000000000 +0100
+++ new/yast2-packager-2.16.14/src/clients/repositories.ycp 2008-01-10 15:51:56.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 42435 2007-11-27 12:53:11Z locilka $
+ * $Id: repositories.ycp 43535 2008-01-10 14:51:56Z lslezak $
*
*/
@@ -39,6 +39,7 @@
import "Product";
include "packager/inst_source_dialogs.ycp";
+ include "packager/key_manager_dialogs.ycp";
integer numSources = 0;
@@ -517,6 +518,8 @@
// store in the persistent libzypp storage
success = success && Pkg::SourceSaveAll(); // #176013
+ success = success && KeyManager::Write();
+
return success;
}
@@ -570,9 +573,9 @@
// label
`Left (`Label (_("Properties"))),
// check box
- `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))),
+ `Left (`CheckBox (`id (`enable), `opt (`notify), _("&Enabled"))),
// check box
- `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))),
+ `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically &Refresh"))),
`VSpacing (0.4),
(have_rug) ?
`Left (`CheckBox (`id (`zmdsync),
@@ -604,6 +607,7 @@
`item(`id(`set_alias), setAliasButtonLabel)
])
*/
+ `PushButton (`id (`key_mgr), _("&GPG Keys...")),
`PushButton (`id (`refresh), refreshButtonLabel )
),
`VSpacing( 0.5 )
@@ -749,6 +753,13 @@
}
}
}
+ else if (input == `key_mgr)
+ {
+ exit = true;
+ //return `key_mgr;
+ // start the GPG key manager
+ //RunGPGKeyMgmt();
+ }
else
{
current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem );
@@ -1028,6 +1039,9 @@
}
}
+ // read known GPG keys
+ KeyManager::Read();
+
sourceStatesIn = Pkg::SourceEditGet();
y2milestone( "Found repositories: %1", sourceStatesIn);
sourceStatesOut = sourceStatesIn;
@@ -1036,7 +1050,8 @@
"summary" : ``(SummaryDialog ()),
"type" : ``(TypeDialog()),
"edit" : ``(EditDialog ()),
- "store" : ``(StoreSource ())
+ "store" : ``(StoreSource ()),
+ "keymgr" : [``(RunGPGKeyMgmt(false)), true]
];
map sequence = $[
@@ -1044,9 +1059,14 @@
"summary" : $[
`add : "type",
`edit : "edit",
+ `key_mgr : "keymgr",
`abort : `abort,
`next : `next,
],
+ "keymgr" : $[
+ `next : "summary",
+ `abort : "summary"
+ ],
"type" : $[
`next : "edit",
`finish : "store",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.13/src/include/key_manager_dialogs.ycp new/yast2-packager-2.16.14/src/include/key_manager_dialogs.ycp
--- old/yast2-packager-2.16.13/src/include/key_manager_dialogs.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.16.14/src/include/key_manager_dialogs.ycp 2008-01-14 16:20:15.000000000 +0100
@@ -0,0 +1,410 @@
+/**
+ * File: key_manager.ycp
+ *
+ * Author: Ladislav Slezak
+ *
+ * Purpose: Manages GPG keys in the package manager
+ *
+ * $Id$
+ */
+
+{
+
+textdomain "packager";
+
+import "Wizard";
+import "WizardHW";
+import "Label";
+import "Popup";
+import "KeyManager";
+import "String";
+import "FileUtils";
+
+boolean gpg_mgr_standalone_mode = false;
+
+/**
+ * Creates a summary table with GPG key configuration
+ * @return list table contents
+ */
+list