Author: mcalmer Date: Fri Jan 15 10:46:15 2010 New Revision: 60389 URL: http://svn.opensuse.org/viewcvs/yast?rev=60389&view=rev Log: - version 2.19.1 - add remove certificate function to common server certificate module (fate#306590) - improve the help text. Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/common_cert.ycp trunk/ca-management/yast2-ca-management.spec.in Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=60389&r1=60388&r2=60389&view=diff ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Fri Jan 15 10:46:15 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-management.changes?rev=60389&r1=60388&r2=60389&view=diff ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Fri Jan 15 10:46:15 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 15 10:34:48 CET 2010 - mc@suse.de + +- version 2.19.1 +- add remove certificate function to common server certificate module + (fate#306590) +- improve the help text. + +------------------------------------------------------------------- Thu Jan 14 12:35:43 CET 2010 - mc@suse.de - version 2.19.0 Modified: trunk/ca-management/src/common_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/common_cert.ycp?rev=60389&r1=60388&r2=60389&view=diff ============================================================================== --- trunk/ca-management/src/common_cert.ycp (original) +++ trunk/ca-management/src/common_cert.ycp Fri Jan 15 10:46:15 2010 @@ -37,19 +37,27 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("ca-management"); -// help text 1/5 -string helptext = _("<p>The <b>Common Server Certificate</b> will be used by other YaST modules.</p>"); -// help text 2/5 -helptext = helptext + _("<p>This certificate can be exchanged by importing a certificate from a file.</p>"); -// help text 3/5 +// help text 1/7 +string helptext = _("<p>A Server Certificate is used by services which provide SSL/TLS encrypted network connections.</p>"); + +// help text 2/7 +helptext = helptext + _("<p>The purpose of the <b>Common Server Certificate</b> is, to provide a certificate for several services running on this host. "); + +// help text 3/7 +helptext = helptext + _("Some YaST modules provide the capability to use this certificate during configuration of such a service.</p>"); + +// help text 4/7 +helptext = helptext + _("<p>With the <b>Import/Replace</b> button you can add a new server certificate or replace the currect one.</p>"); + +// help text 5/7 +helptext = helptext + _("<p>You can remove the Certificates by clicking the <b>Remove</b> button. But make sure, that it is not used anymore by other services.</p>"); + +// help text 6/7 helptext = helptext + _("<p>Certificates can be written to a file using <b>Export to File</b> in section <b>Certificate</b> in the <b>CA Management</b> module.</p>"); -// help text 4/5 +// help text 7/7 helptext = helptext + _("<p>Certificates to import from disk must have been written in <b>PKCS12 format with CA chain</b>.</p>"); -// help text 5/5 -helptext = helptext + _("<p>You can remove the Certificates from disk. But make sure, that it is not used anymore by other services.</p>"); - symbol ui = nil; repeat @@ -74,10 +82,12 @@ `VSpacing (0.5), `RichText (ret), `VSpacing (0.5), - `HBox ( // push button label + `HBox ( `HStretch(), + // push button label `PushButton (`id(`remove), _("&Remove")), - `PushButton (`id(`importDisk), _("&Import"))) + // push button label + `PushButton (`id(`importDisk), _("&Import/Replace"))) ); // To translators: dialog label Modified: trunk/ca-management/yast2-ca-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/yast2-ca-management.spec.in?rev=60389&r1=60388&r2=60389&view=diff ============================================================================== --- trunk/ca-management/yast2-ca-management.spec.in (original) +++ trunk/ca-management/yast2-ca-management.spec.in Fri Jan 15 10:46:15 2010 @@ -1,15 +1,13 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL v2 or later -BuildRequires: dosfstools limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer yast2-devtools pkg-config yast2-core yast2 update-desktop-files -Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI -Requires: limal-ca-mgm-perl >= 1.4.0 - -BuildArchitectures: noarch - -Summary: YaST2 - CAs, Certificates and Requests Management +Group: System/YaST +License: GPLv2+ +BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools +Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI +Requires: limal-ca-mgm-perl >= 1.4.0 +BuildArch: noarch +Summary: YaST2 - CAs, Certificates and Requests Management %description Managing CAs, Certificates and Requests in an understanding way. @@ -19,7 +17,6 @@ @BUILD@ @INSTALL@ - @CLEAN@ %files @@ -45,5 +42,4 @@ /usr/bin/generateCRL.pl /usr/bin/exportCRL.pl %attr(600, root, root) %config(noreplace) /etc/generateCRL.conf - %changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org