Hello community,
here is the log from the commit of package yast2-ca-management for
openSUSE:Factory
checked in at Tue Jun 14 17:26:15 CEST 2011.
--------
--- yast2-ca-management/yast2-ca-management.changes 2011-04-29
11:37:18.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-ca-management/yast2-ca-management.changes
2011-06-14 15:00:38.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Jun 14 13:02:34 CEST 2011 - jreidin...@suse.cz
+
+- version 2.21.1
+- country selection combobox is editable to allow choose of
+ countries not listed there (FATE#310179)
+- allow to change altarnative name in CA proposal (FATE#308423)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ca-management-2.21.0.tar.bz2
New:
----
yast2-ca-management-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ca-management.spec ++++++
--- /var/tmp/diff_new_pack.dG2Fhh/_old 2011-06-14 17:25:56.000000000 +0200
+++ /var/tmp/diff_new_pack.dG2Fhh/_new 2011-06-14 17:25:56.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-ca-management
-Version: 2.21.0
+Version: 2.21.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ca-management-2.21.0.tar.bz2
+Source0: yast2-ca-management-2.21.1.tar.bz2
Prefix: /usr
@@ -39,7 +39,7 @@
Managing CAs, Certificates and Requests in an understanding way.
%prep
-%setup -n yast2-ca-management-2.21.0
+%setup -n yast2-ca-management-2.21.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ca-management-2.21.0.tar.bz2 -> yast2-ca-management-2.21.1.tar.bz2
++++++
++++ 7002 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/VERSION new/yast2-ca-management-2.21.1/VERSION
--- old/yast2-ca-management-2.21.0/VERSION 2011-04-29 11:32:24.000000000
+0200
+++ new/yast2-ca-management-2.21.1/VERSION 2011-06-14 12:58:56.000000000
+0200
@@ -1 +1 @@
-2.21.0
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/configure.in
new/yast2-ca-management-2.21.1/configure.in
--- old/yast2-ca-management-2.21.0/configure.in 2010-03-19 16:07:15.000000000
+0100
+++ new/yast2-ca-management-2.21.1/configure.in 2011-06-14 11:06:39.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ca-management, 2.19.5, http://bugs.opensuse.org/,
yast2-ca-management)
+AC_INIT(yast2-ca-management, 2.21.0, http://bugs.opensuse.org/,
yast2-ca-management)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.5"
+VERSION="2.21.0"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer <m...@suse.de>, J. Daniel Schmidt <j...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/src/CaMgm.ycp
new/yast2-ca-management-2.21.1/src/CaMgm.ycp
--- old/yast2-ca-management-2.21.0/src/CaMgm.ycp 2009-11-19
17:09:49.000000000 +0100
+++ new/yast2-ca-management-2.21.1/src/CaMgm.ycp 2011-06-14
14:53:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Managing CAs, Requests and Certificate
* Authors: Stefan Schubert <sch...@suse.de>
*
- * $Id: CaMgm.ycp 59635 2009-11-19 16:09:48Z mcalmer $
+ * $Id: CaMgm.ycp 64348 2011-06-14 12:53:17Z jreidinger $
*
* Representation of the configuration of CAs
* Input and output routines.
@@ -136,6 +136,7 @@
global symbol prop_selection = `def; // `none, `disk
global list<map> prop_subject_alt_name_list = [];
+global boolean prop_adv_cri_issuer_alt_name = false;
global boolean adv_subject_alt_name_show_email = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/src/YaPI/caUtils.pm
new/yast2-ca-management-2.21.1/src/YaPI/caUtils.pm
--- old/yast2-ca-management-2.21.0/src/YaPI/caUtils.pm 2011-04-29
11:31:46.000000000 +0200
+++ new/yast2-ca-management-2.21.1/src/YaPI/caUtils.pm 2011-06-14
10:29:58.000000000 +0200
@@ -1,7 +1,7 @@
###############################################################
# Copyright 2004, Novell, Inc. All rights reserved.
#
-# $Id: caUtils.pm 61404 2010-03-19 15:07:37Z mcalmer $
+# $Id: caUtils.pm 63890 2011-04-29 09:35:51Z mcalmer $
###############################################################
package YaST::caUtils;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/src/ca_mgm_proposal.ycp
new/yast2-ca-management-2.21.1/src/ca_mgm_proposal.ycp
--- old/yast2-ca-management-2.21.0/src/ca_mgm_proposal.ycp 2010-05-20
11:41:09.000000000 +0200
+++ new/yast2-ca-management-2.21.1/src/ca_mgm_proposal.ycp 2011-06-14
14:53:20.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Stefan Schubert <sch...@suse.de>
*
- * $Id: ca_mgm_proposal.ycp 59635 2009-11-19 16:09:48Z mcalmer $
+ * $Id: ca_mgm_proposal.ycp 64348 2011-06-14 12:53:17Z jreidinger $
*
* Proposal function dispatcher for CA Management
*/
@@ -54,18 +54,20 @@
map<string,string> host_ips = getHostIPs ();
string hostname_bak = "";
- CaMgm::prop_subject_alt_name_list = [];
+ if (size(CaMgm::prop_subject_alt_name_list) <= 0){
+ CaMgm::prop_subject_alt_name_list = [];
- foreach(string key, string value, host_ips, {
-
if(value == "DNS")
-
{
-
hostname_bak = key;
-
}
-
map elem = $[];
-
elem["kind"] = value;
-
elem["name"] = key;
-
CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list,
elem);
- });
+ foreach(string key, string value, host_ips, {
+ if(value == "DNS")
+ {
+ hostname_bak = key;
+ }
+ map elem = $[];
+ elem["kind"] = value;
+ elem["name"] = key;
+ CaMgm::prop_subject_alt_name_list = add
(CaMgm::prop_subject_alt_name_list, elem);
+ });
+ }
map retmap = (map) SCR::Execute (.target.bash_output,
"/bin/hostname --long",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/src/ca_select_proposal.ycp
new/yast2-ca-management-2.21.1/src/ca_select_proposal.ycp
--- old/yast2-ca-management-2.21.0/src/ca_select_proposal.ycp 2008-05-13
17:25:32.000000000 +0200
+++ new/yast2-ca-management-2.21.1/src/ca_select_proposal.ycp 2011-06-14
14:53:20.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
*
*
- * $Id: ca_select_proposal.ycp 47499 2008-05-13 15:25:31Z mcalmer $
+ * $Id: ca_select_proposal.ycp 64348 2011-06-14 12:53:17Z jreidinger $
*
*/
{
@@ -49,6 +49,151 @@
});
return result;
}
+
+ define list editAltNames( list<map> initial_set ){
+ term alt_dialog = `HBox( `VSpacing(10),
+ `VBox (`HSpacing(10),
+ `RadioButtonGroup(`id(`rb),
+ `HBox(
+
`RadioButton(`id("URI"), `opt(`notify), "URI", true),
+
`RadioButton(`id("email"), `opt(`notify), "email"),
+
`RadioButton(`id("DNS"), `opt(`notify), "DNS"),
+
`RadioButton(`id("IP"), `opt(`notify), "IP"),
+
`RadioButton(`id("RID"), `opt(`notify), "RID"),
+
`RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"),
+
`RadioButton(`id("K5PN"), `opt(`notify), "K5PN")
+ )),
+ `TextEntry(`id(`name), _("&Name:")),
+ // push button label
+ `HBox(`PushButton (`id(`cancel),
`opt(`key_F9), Label::CancelButton()),
+ `HStretch(),
+ `PushButton (`id(`ok),
`opt(`default, `key_F10), Label::OKButton())
+ ),
+ `HSpacing(10)
+ ),
+ `VSpacing(10)
+ );
+ UI::OpenDialog (
+ `VBox ( `Left (`CheckBox(`id(`id_adv_cri_subject_alt_name),
+ _("critical"),
+ CaMgm::prop_adv_cri_issuer_alt_name
+ )),
+ `VSpacing(1.5),
+ `HBox(
+ `VSpacing(5),
+ `HWeight (3, `Table (`id (`id_adv_subject_alt_name),
+ `header (
+ // To translators:
table headers
+ _("Kind"),
+ _("Name")
+ )
+ )),
+ `HWeight (1, `VBox(
+ `HBox ( `HWeight (1,`PushButton
(`id (`add),
+
`opt (`key_F3),
+
Label::AddButton()
+ ))),
+ `HBox ( `HWeight (1,`PushButton
(`id (`edit),
+
`opt (`key_F3),
+
Label::EditButton()
+ ))),
+ `HBox ( `HWeight (1,`PushButton
(`id (`delete),
+
`opt (`key_F5),
+
Label::DeleteButton()
+ ))),
+ `VStretch()
+ ))),
+ `VSpacing(1.5),
+
`ButtonBox(`PushButton(`id(`ok),`opt(`key_F10),Label::OKButton()),
+ `PushButton
(`id(`cancel),`opt(`key_F9,`default), Label::CancelButton())
+ )
+ ));
+ any ret = nil;
+ do {
+ integer i = 0;
+ list<term> table_list = maplist( map element, initial_set, ``{
+ i = i + 1;
+ return `item (`id (i), element["kind"]:"", element["name"]:""
);
+ });
+ UI::ChangeWidget(`id(`id_adv_subject_alt_name), `Items,
table_list);
+ ret = UI::UserInput();
+ if (ret == `add || ret == `edit ){
+ string current_kind = "";
+ string current_name = "";
+ if (ret == `edit){
+ integer current_item =
(integer)UI::QueryWidget(`id(`id_adv_subject_alt_name), `CurrentItem);
+ term table_item = (term)
UI::QueryWidget(`id(`id_adv_subject_alt_name), `Item(current_item));
+ if (table_item == nil)
+ {
+ Popup::Error (_("No item has been selected."));
+ continue;
+ }
+
+ current_kind = (string) table_item[1]:"";
+ current_name = (string) table_item[2]:"";
+ }
+ UI::OpenDialog (`opt(`decorated ),alt_dialog);
+ UI::SetFocus (`id(`ok));
+ if (ret == `edit){
+ UI::ChangeWidget(`id(`name), `Value, current_name);
+ UI::ChangeWidget(`id(`rb), `CurrentButton, current_kind);
+ }
+ if(!CaMgm::adv_subject_alt_name_show_email)
+ {
+ UI::ChangeWidget(`id("email"), `Enabled, false);
+ } else {
+ UI::ChangeWidget(`id("email"), `Enabled, true);
+ }
+ while (true)
+ {
+ any ret2 = UI::UserInput();
+ if (ret2 == `ok)
+ {
+ map new_entry = (ret==`add) ? $[] :
+ find(map m,initial_set,
+ ``{return (m["kind"]:"" == current_kind
&& m["name"]:"" == current_name);});
+ new_entry["kind"] = (string) UI::QueryWidget(`id(`rb),
`CurrentButton);
+ new_entry["name"] = (string)
UI::QueryWidget(`id(`name), `Value);
+ if (ret == `add)
+ {
+ initial_set = add (initial_set, new_entry);
+ }
+ break;
+ }
+ else if (ret2 == `cancel)
+ {
+ break;
+ }
+ }
+ UI::CloseDialog ();
+ } else if (ret == `delete) {
+ integer current_item =
(integer)UI::QueryWidget(`id(`id_adv_subject_alt_name), `CurrentItem);
+ term table_item = (term)
UI::QueryWidget(`id(`id_adv_subject_alt_name), `Item(current_item));
+
+ if (table_item == nil)
+ {
+ Popup::Error (_("No item has been selected."));
+ continue;
+ }
+ string current_kind = (string) table_item[1]:"";
+ string current_name = (string) table_item[2]:"";
+
+ if (Popup::YesNoHeadline (
+ // To translators: ContinueCancel Popup headline
+ _("Delete"),
+ // To translators: ContinueCancel Popup
+ _("Really delete this entry?")))
+ {
+ initial_set = filter( map element, initial_set, ``{
+ return (element["kind"]:"" != current_kind ||
element["name"]:"" != current_name );
+ });
+ }
+ }
+ } while ( ret != `ok && ret != `cancel );
+ boolean ca_crit = (boolean)
UI::QueryWidget(`id(`id_adv_cri_subject_alt_name), `Value);
+ UI::CloseDialog();
+ return (ret == `ok) ? [initial_set,ca_crit] : nil;
+ }
/**
@@ -97,7 +242,7 @@
),
`HBox(`HWeight (1,`TextEntry(`id(`email),
_("E-Mail"), CaMgm::prop_email)),
`HSpacing(2),
- `HWeight (1,`Empty())
+ `HWeight (1,`PushButton(`id(`alt),"&Edit
Alternative Names"))
)
);
@@ -119,12 +264,21 @@
// Get the user input.
//
any ret = nil;
+ list<map> temp_alt_names = CaMgm::prop_subject_alt_name_list;
+ boolean temp_cri_alt = CaMgm::prop_adv_cri_issuer_alt_name;
repeat
{
ret = Wizard::UserInput();
- if (ret == `next
+ if (ret == `alt)
+ {
+ any ret = editAltNames(temp_alt_names);
+ if (ret != nil)
+ temp_alt_names = ((list)ret)[0]:temp_alt_names;
+ temp_cri_alt = ((list)ret)[1]:temp_cri_alt;
+ }
+ else if (ret == `next
||ret == `back)
{
confirmPassword = (string) UI::QueryWidget(`id(`pw2),
`Value);
@@ -183,6 +337,9 @@
CaMgm::prop_organisationUnit = (string)
UI::QueryWidget(`id(`id_organisationUnit), `Value);
CaMgm::prop_locality = (string)
UI::QueryWidget(`id(`id_locality), `Value);
CaMgm::prop_state = (string)
UI::QueryWidget(`id(`id_state), `Value);
+ CaMgm::prop_subject_alt_name_list = temp_alt_names;
+ CaMgm::prop_adv_cri_issuer_alt_name = temp_cri_alt;
+ y2milestone("alt names %1",
CaMgm::prop_subject_alt_name_list);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ca-management-2.21.0/src/new_cert_read_write.ycp
new/yast2-ca-management-2.21.1/src/new_cert_read_write.ycp
--- old/yast2-ca-management-2.21.0/src/new_cert_read_write.ycp 2010-01-14
12:53:47.000000000 +0100
+++ new/yast2-ca-management-2.21.1/src/new_cert_read_write.ycp 2011-06-14
14:53:20.000000000 +0200
@@ -13,7 +13,7 @@
* Authors:
* Stefan Schubert <sch...@suse.de>
*
- * $Id: new_cert_read_write.ycp 60358 2010-01-14 11:53:46Z mcalmer $
+ * $Id: new_cert_read_write.ycp 64348 2011-06-14 12:53:17Z jreidinger $
*
* Creating a new CA/Certificate
*
@@ -760,6 +760,7 @@
foreach(map elem, CaMgm::prop_subject_alt_name_list, {
CaMgm::adv_subject_alt_name_list = add (CaMgm::adv_subject_alt_name_list, elem);
});
+ CaMgm::adv_cri_issuer_alt_name =
CaMgm::prop_adv_cri_issuer_alt_name;
}
if (kind == "Client Certificate")
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
