From 31d36320c43dc5020a309c00f01ee75b9252d4e2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 21 2020 18:29:21 +0000
Subject: import esc-1.1.2-14.el8


---

diff --git a/SOURCES/esc-1.1.2-fix9.patch b/SOURCES/esc-1.1.2-fix9.patch
new file mode 100644
index 0000000..0ddf203
--- /dev/null
+++ b/SOURCES/esc-1.1.2-fix9.patch
@@ -0,0 +1,41 @@
+diff -up ./esc/src/app/esc.js.fix9 ./esc/src/app/esc.js
+--- ./esc/src/app/esc.js.fix9	2020-08-12 11:15:29.423093856 -0700
++++ ./esc/src/app/esc.js	2020-08-12 11:43:47.646556310 -0700
+@@ -271,7 +271,6 @@ class ESC {
+          if(!insertedToken && !doReset) {
+              return;
+          }
+-     
+          if(doReset) {
+              this._operationsGrid.remove(this._phoneHomeButton);
+              this._operationsGrid.remove(this._enrollButton);
+@@ -297,6 +296,12 @@ class ESC {
+              }
+ 
+              this._operationsGrid.show_all();
++         } else {
++             if(insertedToken.status == 4) {
++                 this._operationsGrid.add(this._certDetailButton);
++		 this._operationsGrid.show_all();
++
++	     }
+          }
+      }
+ 
+diff -up ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix9 ./esc/src/lib/coolkey/CoolKeyHandler.cpp
+--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix9	2020-08-12 10:59:24.844704399 -0700
++++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2020-08-12 11:11:05.480713407 -0700
+@@ -2329,11 +2329,11 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
+     }
+ 
+     //Massage the tokenInfo so it adhered to when coolkey was doing it.
+-    if(hasApplet) {
++    if(hasApplet == 1 || isACAC == 1 || isAPIV == 1) {
+         tokenInfo.firmwareVersion.major = 1;    
+     }
+ 
+-    if(isPersonalized) {
++    if(isPersonalized == 1 || isACAC == 1 || isAPIV == 1) {
+         tokenInfo.flags |= CKF_TOKEN_INITIALIZED;
+     }
+ 
diff --git a/SPECS/esc.spec b/SPECS/esc.spec
index 5ee6339..e995ae3 100644
--- a/SPECS/esc.spec
+++ b/SPECS/esc.spec
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.1.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -15,6 +15,7 @@ Patch5: esc-1.1.2-fix5.patch
 Patch6: esc-1.1.2-fix6.patch
 Patch7: esc-1.1.2-fix7.patch
 Patch8: esc-1.1.2-fix8.patch
+Patch9: esc-1.1.2-fix9.patch
 
 
 #BuildRequires: doxygen fontconfig-devel
@@ -81,6 +82,7 @@ cryptographic smartcards.
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
 %patch8 -p1 -b .fix8
+%patch9 -p1 -b .fix9
 
 
 %build
@@ -149,6 +151,8 @@ cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}
 %{_datadir}/%{appdir}/esc.desktop
 
 %changelog
+* Fri Aug 07 2020 Jack Magne <jmagne@redhat.com> - 1.1.2-14
+- Resolves: rhbz#1848629 - Smartcard is not detected by esc. Ammendment to bug fix.
 * Fri Aug 07 2020 Jack Magne <jmagne@redhat.com> - 1.1.2-13
 - Resolves: rhbz#1848629 - Smartcard is not detected by esc
 * Sat May 30 2020 Jack Magne <jmagne@redhat.com> - 1.1.2-12