[Pkg-fedora-ds-maintainers] 389-admin-console: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Tue Mar 10 09:14:13 UTC 2015
build.properties | 2 -
build.xml | 6 ++--
debian/changelog | 7 +++++
debian/watch | 2 -
help/en/help/add_crl_ckl.html | 2 -
help/en/help/certificate_request_wizard_key_signing_information.html | 13 ++++++++++
help/en/tokens.map | 1
src/com/netscape/management/admserv/admserv.properties | 2 +
src/com/netscape/management/admserv/task/Restart.java | 11 +++++---
9 files changed, 36 insertions(+), 10 deletions(-)
New commits:
commit ec3832aa363a39eccf6a7ee29eeffd462bbd7a6f
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Tue Mar 10 11:06:55 2015 +0200
releasing package 389-admin-console version 1.1.10-1
diff --git a/debian/changelog b/debian/changelog
index 1fd9996..9be93c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-389-admin-console (1.1.10-1) UNRELEASED; urgency=medium
+389-admin-console (1.1.10-1) unstable; urgency=medium
* New upstream release.
* watch: Update the url.
- -- Timo Aaltonen <tjaalton at debian.org> Tue, 10 Mar 2015 10:17:41 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Tue, 10 Mar 2015 10:21:04 +0200
389-admin-console (1.1.8-2) unstable; urgency=low
commit af7b15d077e6e08d34194dda24b9b7031f774c85
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Tue Mar 10 10:18:18 2015 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 1611027..1fd9996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-389-admin-console (1.1.8-3) UNRELEASED; urgency=medium
+389-admin-console (1.1.10-1) UNRELEASED; urgency=medium
+ * New upstream release.
* watch: Update the url.
-- Timo Aaltonen <tjaalton at debian.org> Tue, 10 Mar 2015 10:17:41 +0200
commit 4ba73b34e924fe5bd08870a56bd7b2acb2cea71b
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Tue Mar 10 10:17:47 2015 +0200
watch: Update the url.
diff --git a/debian/changelog b/debian/changelog
index 25ddae1..1611027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-admin-console (1.1.8-3) UNRELEASED; urgency=medium
+
+ * watch: Update the url.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Tue, 10 Mar 2015 10:17:41 +0200
+
389-admin-console (1.1.8-2) unstable; urgency=low
* watch: Add a comment about the upstream git tree.
diff --git a/debian/watch b/debian/watch
index 1962e3d..c73b90a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://git.fedorahosted.org/389/admin-console.git
version=3
-http://directory.fedoraproject.org/wiki/Source .*/389-admin-console-(.*).tar.bz2
+http://www.port389.org/binaries/389-admin-console-([0-9.]+)\.tar\.bz2
commit 4b005e979b2c6c8794356c952a875e9a66aa7d23
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Wed Feb 11 14:18:37 2015 -0800
bump version to 1.1.10
diff --git a/build.properties b/build.properties
index 645c7ea..eea269a 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.1.9
+admservconsole.version=1.1.10
admservconsole.gen.version=1.1
brand=389
admservconsole.name=${brand}-admin-${admservconsole.version}
commit 60ab24bea0872293e4bf8ff58c62fe25c677f4cd
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Wed Feb 11 13:44:10 2015 -0800
Bug 1022104 - Remove versioned jarfiles from _javadir
Due to this change made to idm-console-framework, include jar file
name in build.xml should be replaced as follows.
- <include name="**/idm-console-base-*.jar"/>
- <include name="**/idm-console-mcc-*.jar"/>
- <include name="**/idm-console-nmclf-*.jar"/>
+ <include name="**/idm-console-base.jar"/>
+ <include name="**/idm-console-mcc.jar"/>
+ <include name="**/idm-console-nmclf.jar"/>
diff --git a/build.xml b/build.xml
index caa83ea..540c75d 100644
--- a/build.xml
+++ b/build.xml
@@ -85,9 +85,9 @@ END COPYRIGHT BLOCK
<!-- Construct classpath -->
<path id="admservconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/idm-console-base-*.jar"/>
- <include name="**/idm-console-mcc-*.jar"/>
- <include name="**/idm-console-nmclf-*.jar"/>
+ <include name="**/idm-console-base.jar"/>
+ <include name="**/idm-console-mcc.jar"/>
+ <include name="**/idm-console-nmclf.jar"/>
</fileset>
<fileset dir="${ldapjdk.location}">
<include name="**/ldapjdk.jar"/>
commit 4f12c1cafc6627d9647180029f5c210bac61bb96
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Thu Dec 11 12:17:58 2014 -0800
bump version to 1.1.9
diff --git a/build.properties b/build.properties
index 07061c3..645c7ea 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.1.8
+admservconsole.version=1.1.9
admservconsole.gen.version=1.1
brand=389
admservconsole.name=${brand}-admin-${admservconsole.version}
commit ac0e0b55498cee065b338a2dded995e85af99570
Author: Ludwig <lkrispen at elkris2.redhat.com>
Date: Thu Oct 17 14:07:00 2013 +0200
Ticket 47477 - Cannot restart SSL-admin server from console
Bug Description: If SSL is enabled for admin server console rejects to restart admin server
Fix Description: Behaviour like DS, warn about required password file and ask confirmation to restart
https://fedorahosted.org/389/ticket/47477
Reviewed by: RichM
diff --git a/src/com/netscape/management/admserv/admserv.properties b/src/com/netscape/management/admserv/admserv.properties
index 5c69620..82c3c91 100644
--- a/src/com/netscape/management/admserv/admserv.properties
+++ b/src/com/netscape/management/admserv/admserv.properties
@@ -107,6 +107,8 @@ taskDescription-SNMPRestart=Restart SNMP Master Agent
taskDescription-SNMPStop=Stop SNMP Master Agent
restart-canNotRestart=The Administration Server cannot be restarted remotely from the Console.\nThe server can be restarted only locally from the command shell\nby running the "restart-admin" command.
+restart-confirmSSLRestart=Warning: Starting SSL-Enabled Admin Server \n\nYou cannot start an SSL-enabled Admin Server remotely unless\nyou have configured a password file for the server. If a password\nfile does not exist, you must log on to the machine where the\nserver is installed and start the server from the command line.\nThe restart-ds-admin script will prompt you for the certificate database\npassword when it starts the server.\n\nContinue to restart the server?
+
#
# information panel
diff --git a/src/com/netscape/management/admserv/task/Restart.java b/src/com/netscape/management/admserv/task/Restart.java
index c7e502f..c5c1eff 100644
--- a/src/com/netscape/management/admserv/task/Restart.java
+++ b/src/com/netscape/management/admserv/task/Restart.java
@@ -66,10 +66,13 @@ public class Restart extends AdminTaskObject {
if (restartControl != null) {
if (!restartControl.canRestartFromConsole()) {
String msg =
- AdminServer._resource.getString("restart","canNotRestart");
- SuiOptionPane.showMessageDialog(parent, msg, getName(),
- SuiOptionPane.ERROR_MESSAGE);
- return false;
+ AdminServer._resource.getString("restart","confirmSSLRestart");
+ int userSelection = SuiOptionPane.showConfirmDialog(parent, msg,
+ "Restart SSL-Enabled Server", SuiOptionPane.YES_NO_OPTION);
+
+ if (userSelection != SuiOptionPane.YES_OPTION) {
+ return false;
+ }
}
} else {
Debug.println("RestartOperation: restart activator not in ConsoleInfo");
commit 9ef26b819910cfc54d77541ed57b0605743a27fa
Author: Nathan Kinder <nkinder at redhat.com>
Date: Wed Aug 14 14:11:25 2013 -0700
Ticket 47467 - Improve online help for Add CRL dialog
This improves the online help page for the Console Add CRL/CKL
dialog. The help now specifies the required format for the CRL/CKL
as well as mentioning that a path should not be specified.
diff --git a/help/en/help/add_crl_ckl.html b/help/en/help/add_crl_ckl.html
index 458fb7f..5245d0b 100644
--- a/help/en/help/add_crl_ckl.html
+++ b/help/en/help/add_crl_ckl.html
@@ -6,7 +6,7 @@ Add CRL/CKL
Use this dialog box to add a Certificate Revocation List (CRL) or a Compromised Key List (CKL) to the trust database.
</p>
<p class="text">
-<b>Enter CRL/CKL file.</b> Provide the name of the file containing the CRL or CKL. This file must exist in the same directory as your key and cert database.
+<b>Enter CRL/CKL file.</b> Provide the name of the file containing the CRL or CKL. The file must be in PEM format (base64 encoded DER). This file must exist in the same directory as your key and cert database. You must only specify the file name, not an absolute or relative path.
</p>
<p class="text">
<b>File contains a Certificate Revocation List (CRL).</b> Select this option if the file contains a CRL.
commit 91568bdc5a2ef6124f86b92f94d87b8c0e00ca20
Author: Nathan Kinder <nkinder at redhat.com>
Date: Tue Aug 13 18:43:40 2013 -0700
Ticket 362 - Directory Console generates insufficient key strength
This patch adds an online help page for a new panel that is being
added to the Console's certificate request wizard. This new panel
has 2 combo boxes that allow the key size and signing algorithms
to be selected. The new help page describes what these combo boxes
control.
diff --git a/help/en/help/certificate_request_wizard_key_signing_information.html b/help/en/help/certificate_request_wizard_key_signing_information.html
new file mode 100644
index 0000000..40b7265
--- /dev/null
+++ b/help/en/help/certificate_request_wizard_key_signing_information.html
@@ -0,0 +1,13 @@
+<p class="topic">
+Certificate Request Wizard - Key and Signing Information
+</p>
+
+<p class="text">
+The cryptographic strength for SSL/TLS connections can be controlled by selecting the RSA key size that you would like to generate. The algorithm used to sign the generated certificate signing request can also be selected.
+</p>
+<p class="text">
+<b>RSA Key Size.</b> Select the size of the RSA key to generate (in bits).
+</p>
+<p class="text">
+<b>Signing Algorithm.</b> Select the algorithm to use to sign the certificate request.
+</p>
diff --git a/help/en/tokens.map b/help/en/tokens.map
index a9cea8f..f377bde 100644
--- a/help/en/tokens.map
+++ b/help/en/tokens.map
@@ -130,6 +130,7 @@ CertificateDetailDialogPath-help = help/certificate_information_certification_
;CERTIFICATE REQUEST WIZARD
CertRequestWizard-help = help/certificate_request_wizard_introduction.html
CertRequestInfoPage-help = help/certificate_request_wizard_requestor_information.html
+CertRequestKeyPage-help = help/certificate_request_wizard_key_signing_information.html
TokenPasswordPage-help = help/certificate_request_install_wizard_token_password.html
CertRequestSubmissionPage-help = help/certificate_request_wizard_request_submission.html
More information about the Pkg-fedora-ds-maintainers
mailing list