rpms/esc/devel esc-1.0.0-pw-reset-fix.patch, NONE, 1.1 esc.spec, 1.15, 1.16
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Sep 17 01:15:24 UTC 2006
Author: jmagne
Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10862/devel
Modified Files:
esc.spec
Added Files:
esc-1.0.0-pw-reset-fix.patch
Log Message:
auto-import esc-1.0.0-12 on branch devel from esc-1.0.0-12.src.rpm
esc-1.0.0-pw-reset-fix.patch:
xpcom/rhCoolKey.cpp | 2 +-
xul/esc/application.ini | 2 +-
xul/esc/chrome/content/esc/ESC.js | 11 +++++++----
xul/esc/chrome/content/esc/settings.xul | 14 +++++++++-----
xul/esc/chrome/locale/en-US/esc.dtd | 4 ++--
xul/esc/chrome/locale/en-US/esc.properties | 6 +++---
6 files changed, 23 insertions(+), 16 deletions(-)
--- NEW FILE esc-1.0.0-pw-reset-fix.patch ---
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix13 2006-09-16 16:45:31.000000000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2006-09-16 16:45:41.000000000 -0700
@@ -1339,7 +1339,7 @@
{
PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
- char *version = "1.0.0-11";
+ char *version = "1.0.0-12";
char *versionVal = (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) + 1);
--- ./esc/src/app/xul/esc/application.ini.fix13 2006-09-16 16:45:01.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini 2006-09-16 16:45:14.000000000 -0700
@@ -29,7 +29,7 @@
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=00000000011
+BuildID=00000000012
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix13 2006-09-16 10:48:55.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js 2006-09-16 16:54:26.000000000 -0700
@@ -1530,19 +1530,19 @@
return;
}
- if(pwstrength < 20)
+ if(pwstrength < 40)
{
qualityImage.setAttribute("src", "2-vweak.png");
return;
}
- if(pwstrength >= 20 && pwstrength < 40)
+ if(pwstrength >= 40 && pwstrength < 50)
{
qualityImage.setAttribute("src","3-weak.png");
return;
}
- if(pwstrength >=40 && pwstrength < 60)
+ if(pwstrength >=50 && pwstrength < 60)
{
qualityImage.setAttribute("src","4-fair.png");
return;
@@ -3016,7 +3016,7 @@
var keyID = keyInfo[1];
var screenname = null;
- var pin = null;
+ var pin = GetPINValue();
var screennamepwd = null;
if (GetCoolKeyIsEnrolled(keyType, keyID))
@@ -3273,6 +3273,9 @@
function OnCoolKeyPINResetComplete(keyType, keyID)
{
+ if(gHiddenPage)
+ return;
+
var keyStatus = PolicyToKeyType(GetCoolKeyPolicy(keyType, keyID));
var keyReqAuth = BoolToYesNoStr(GetCoolKeyRequiresAuth(keyType, keyID));
var keyIsAuthed = BoolToYesNoStr(GetCoolKeyIsAuthed(keyType, keyID));
--- ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix13 2006-09-16 10:49:17.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/settings.xul 2006-09-16 11:27:30.000000000 -0700
@@ -47,7 +47,7 @@
<spacer flex="1"/>
</vbox>
</hbox>
- <groupbox flex ="1" orient="vertical" class="outerGroupBox">
+ <!-- <groupbox flex ="1" orient="vertical" class="outerGroupBox"> -->
<vbox id="administer-message-id">
<spacer flex="1"/>
<description class="messageText">
@@ -133,21 +133,25 @@
<button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey()" disabled="true" hidden = "false"/>
+ <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
+
<button class="buttonText" id="resetpinbtn" label="&doResetPin;" oncommand="DoCollectPassword('resetpin');" disabled="true" hidden="false"/>
- <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
- <button class="buttonText" id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
+<!-- <button class="buttonText" id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
<button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
-
+-->
</vbox>
</groupbox>
</hbox>
<hbox id = "enrollment_button_box" >
+ <button class="buttonText" id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
+ <button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
+
<spacer flex = "1"/>
<button class="buttonText" id="closebtn" label ="&closeAdminLater;" oncommand="HideAdminPage();"/>
<spacer class="horSpacerShort"/>
</hbox>
- </groupbox>
+ <!-- </groupbox> -->
</window>
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix13 2006-09-16 11:39:26.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd 2006-09-16 11:45:01.000000000 -0700
@@ -33,7 +33,7 @@
<!ENTITY doCancel "Cancel">
<!ENTITY doResetPin "Reset Password">
<!ENTITY doFormat "Format">
-<!ENTITY keyPassword "Password">
+<!ENTITY keyPassword "Smart Card Password">
<!ENTITY pluggedInCards "Active Smart Cards">
<!ENTITY keyIssuer "Issuer">
<!ENTITY keyIssuedTo "Issued To">
@@ -75,7 +75,7 @@
<!ENTITY adminDetailsMessage "This smart card is not personalized.">
<!ENTITY advancedInfo "Diagnostics">
<!ENTITY doViewCerts "View Certificates">
-<!ENTITY getESCPassword "Password Information">
+<!ENTITY getESCPassword "Password">
<!ENTITY escOK "OK">
<!ENTITY escCancel "Cancel">
<!ENTITY tpsConfigDesc "You have inserted a smart card that the Smart Card Manager recognizes, but needs to be formatted.">
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix13 2006-09-16 11:39:18.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties 2006-09-16 11:40:43.000000000 -0700
@@ -55,9 +55,9 @@
readyToProceed=When you are ready to begin the process,click Enroll My Smart Card Now.
formatingToken=Formatting...
enrollingToken=Enrolling...
-resettingTokenPIN=Resetting Password...
-cancellingOperation=Cancelling...
-blinkingToken=Blinking...
+resettingTokenPIN=Password Reset..
+cancellingOperation=Cancelling..
+blinkingToken=Blinking..
keyInserted=Smart Card Inserted!
keyRemoved=Smart Card Removed!
keyInsertedComputer=Security Smart Card Inserted into the computer.
Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- esc.spec 16 Sep 2006 00:50:54 -0000 1.15
+++ esc.spec 17 Sep 2006 01:15:21 -0000 1.16
@@ -1,6 +1,6 @@
Name: esc
Version: 1.0.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Enterprise Security Client Smart Card Client
License: GPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -18,6 +18,7 @@
Patch8: esc-1.0.0-strings-fix.patch
Patch11: esc-1.0.0.strings-1-fix.patch
Patch12: esc-1.0.0-ui-enhance-1.patch
+Patch13: esc-1.0.0-pw-reset-fix.patch
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -74,6 +75,7 @@
%patch8 -p1 -b .fix8
%patch11 -p1 -b .fix11
%patch12 -p1 -b .fix12
+%patch13 -p1 -b .fix13
#Unpack xulrunner where esc expects it to be.
@@ -181,6 +183,9 @@
fi
%changelog
+* Sat Sep 16 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-12
+- Fix for Password Reset and minor UI revision.
+
* Fri Sep 15 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-11
- Further UI enhancement bug fixes
More information about the fedora-cvs-commits
mailing list