6 changed files with 341 additions and 309 deletions
--- a/SOURCES/esc-1.1.2-fix11.patch
+++ b/SOURCES/esc-1.1.2-fix11.patch
@ -1,58 +1,104 @@
-diff -up ./esc/src/lib/coolkey/Makefile.am.fix11 ./esc/src/lib/coolkey/Makefile.am
--- ./esc/src/lib/coolkey/Makefile.am.fix11	2021-09-23 15:54:17.207378817 -0700
-+++ ./esc/src/lib/coolkey/Makefile.am	2021-09-23 17:36:26.312894242 -0700
-@@ -24,6 +24,7 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-+COOLKEY_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
+diff -up ./esc/src/app/esc.js.fix11 ./esc/src/app/esc.js
+--- ./esc/src/app/esc.js.fix11	2022-06-15 19:12:43.974710780 -0400
+++ ./esc/src/app/esc.js	2022-06-15 19:12:54.657664269 -0400
+@@ -581,7 +581,6 @@ class ESC {
+          this._configFile =  new GLib.KeyFile();
 
- AM_CPPFLAGS += \
- 	$(COOLKEY_CFLAGS) \
-@@ -51,8 +52,8 @@ source_c           = \
+          this._configPath = GLib.get_user_config_dir() + "/esc";
+-
+          let configDir = Gio.File.new_for_path(this._configPath);
 
- lib_LTLIBRARIES += libCoolkey-1.0.la
+          try {
+@@ -606,6 +605,9 @@ class ESC {
+              this._configFile.save_to_file(this._configFileName); 
+          } 
+      }
+     _initConfigTokenManuIDs() {
+        this._setConfigValue("esc.token.manu_id.0","Volkswagen AG");
+     }
 
-libCoolkey_1_0_la_CFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@  -I ../nss-http-client
-libCoolkey_1_0_la_CPPFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ -I ../nss-http-client
-+libCoolkey_1_0_la_CFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ $(AM_CFLAGS)  -I ../nss-http-client
-+libCoolkey_1_0_la_CPPFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ $(AM_CPPFLAGS) -I ../nss-http-client
- libCoolkey_1_0_la_LIBADD = $(COOLKEY_LIBS)
- libCoolkey_1_0_la_LDFLAGS = -Wl,-z,now
- libCoolkey_1_0_la_SOURCES = $(source_c) $(source_cpp)
-diff -up ./esc/src/lib/coolkey-mgr/Makefile.am.fix11 ./esc/src/lib/coolkey-mgr/Makefile.am
--- ./esc/src/lib/coolkey-mgr/Makefile.am.fix11	2021-09-23 17:37:12.680837943 -0700
-+++ ./esc/src/lib/coolkey-mgr/Makefile.am	2021-09-23 18:25:02.611294039 -0700
-@@ -24,8 +24,9 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-+COOLKEY_MGR_CFLAGS=-fcf-protection=full
+     _buildUI() {
+         // Create the application window
+@@ -637,6 +639,7 @@ class ESC {
 
-OTHER_CPPFLAGS = -I ../coolkey $(PCSC_CFLAGS)
-+OTHER_CPPFLAGS = -I ../coolkey $(PCSC_CFLAGS) $(COOLKEY_MGR_CFLAGS)
- OTHER_LIBS = -L../coolkey/.libs -lCoolkey-1.0 -L../nss-http-client/.libs -lNssHttpClient-1.0 $(DBUS_LIBS)
- ESC_CFLAGS += $(DBUS_CFLAGS)
 
-diff -up ./esc/src/lib/nss-http-client/Makefile.am.fix11 ./esc/src/lib/nss-http-client/Makefile.am
--- ./esc/src/lib/nss-http-client/Makefile.am.fix11	2021-09-23 16:09:43.841312015 -0700
-+++ ./esc/src/lib/nss-http-client/Makefile.am	2021-09-23 17:36:44.518872136 -0700
-@@ -24,6 +24,7 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-+NSS_HTTP_CLIENT_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
- AM_CPPFLAGS += \
- 	$(NSS_HTTP_CLIENT_CFLAGS) \
- 	$(NULL)
-@@ -49,8 +50,8 @@ source_c           = \
- MYDEFS = @DEFS@
- lib_LTLIBRARIES += libNssHttpClient-1.0.la
+             this._initConfig();
+            this._initConfigTokenManuIDs();
+             this._initProperties();
 
-#libNssHttpClient_1_0_la_CFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ -DLINUX -I ../coolkey
-libNssHttpClient_1_0_la_CPPFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ -I ../coolkey @DEFS@
-+#libNssHttpClient_1_0_la_CFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ -DLINUX  $(AM_CFLAGS) -I ../coolkey
-+libNssHttpClient_1_0_la_CPPFLAGS = @PCSC_CFLAGS@ @NSPR_CFLAGS@ @NSS_CFLAGS@ $(AM_CPPFLAGS) -I ../coolkey @DEFS@
- libNssHttpClient_1_0_la_LIBADD = $(COOLKEY_LIBS)
- libNssHttpClient_1_0_la_LDFLAGS = -Wl,-z,now
- libNssHttpClient_1_0_la_SOURCES = $(source_c) $(source_cpp) $(source_h)
+             this._statusMessages = null; 
+diff -up ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix11 ./esc/src/lib/coolkey/CoolKeyHandler.cpp
+--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix11	2022-06-15 19:10:26.278310248 -0400
+++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2022-06-15 19:10:46.824220800 -0400
+@@ -63,6 +63,7 @@ static const char *piv_manu_id_1=  "piv_
+ static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("coolKeyHandler");
+ 
+ void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int description);
+bool isTokenTypeOtherKnownType(CK_TOKEN_INFO *tokenInfo);
+ 
+ struct AutoCKYBuffer : public CKYBuffer
+ {
+@@ -2246,6 +2247,7 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
+     int isACOOLKey = 0;
+     int isACAC = 0;
+     int isAPIV = 0;
+    bool isOtherKey = false;
+ 
+     int hasApplet = 0;
+     int isPersonalized = 0;
+@@ -2306,6 +2308,12 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
+ 	isAPIV = 1;
+     } else {
+         isACOOLKey = 1;
+        isOtherKey = isTokenTypeOtherKnownType(&tokenInfo);
+        if(isOtherKey == true && hasApplet == 0 && isPersonalized == 0) {
+            isACOOLKey = 0;
+        } else {
+            isOtherKey = false;
+        }
+     }
+ 
+     // OK, we have everything we need, now build the COOLKEYInfo structure.
+@@ -2336,7 +2344,7 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
+         tokenInfo.firmwareVersion.major = 1;    
+     }
+ 
+-    if(isPersonalized == 1 || isACAC == 1 || isAPIV == 1) {
+    if(isPersonalized == 1 || isACAC == 1 || isAPIV == 1 || isOtherKey == true) {
+         tokenInfo.flags |= CKF_TOKEN_INITIALIZED;
+     }
+ 
+@@ -2407,3 +2415,33 @@ failed:
+     
+     return NULL;
+ }
+
+bool isTokenTypeOtherKnownType(CK_TOKEN_INFO *tokenInfo)
+{
+    char tBuff[56];
+    bool res = false;
+
+    if(tokenInfo == NULL) {
+        return res;
+    }
+    string curManuCfg;
+    string num;
+    for(int i = 0;;i++) {
+        num = to_string(i);
+        curManuCfg = "esc.token.manu_id." + num;
+        const char *curManu = CoolKeyGetConfig(curManuCfg.c_str());
+
+        if(curManu == NULL) {
+            break;
+        }
+
+        int match = memcmp(tokenInfo->manufacturerID, curManu, strlen(curManu));
+        CoolKeyFreeConfig(curManu);
+        if(match == 0) {
+            res = true;
+            break;
+        }
+    }
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CoolKeyHandler::isTokenTypeOtherKnownType:  result: %d .\n",GetTStamp(tBuff,56), res));
+    return res;
+}
--- a/SOURCES/esc-1.1.2-fix12.patch
+++ b/SOURCES/esc-1.1.2-fix12.patch
@ -1,70 +0,0 @@
-diff -up ./esc/configure.ac.fix12 ./esc/configure.ac
--- ./esc/configure.ac.fix12	2021-09-27 14:53:49.932567105 -0700
-+++ ./esc/configure.ac	2021-09-27 15:31:30.949185258 -0700
-@@ -47,6 +47,30 @@ PKG_CHECK_MODULES([DBUS],[dbus-1])
- AC_PROG_CC_STDC
- 
- # Compiler flags
-+
-+AC_CANONICAL_HOST
-+ARCH_CPPFLAGS=""
-+ARCH_CFLAGS=""
-+
-+AS_CASE([$host_os],
-+        [linux*],
-+        [
-+           AS_CASE([$host_cpu],
-+                   [x86_64],
-+                   [
-+                       ARCH_CPPFLAGS="-fcf-protection=full"
-+                       ARCH_CFLAGS="-fcf-protection=full"
-+                   ],
-+                   [i?86],
-+                   [
-+                       ARCH_CPPFLAGS="-fcf-protection=full"
-+                       ARCH_CFLAGS="-fcf-protection=full"
-+                   ])
-+        ])
-+AC_SUBST(ARCH_CPPFLAGS)
-+AC_SUBST(ARCH_CFLAGS)
-+
-+
- ESC_CFLAGS="$GOBJECT_CFLAGS"
- ESC_LIBS="$GOBJECT_LIBS $NSS_LIBS" 
- 
-diff -up ./esc/src/lib/coolkey/Makefile.am.fix12 ./esc/src/lib/coolkey/Makefile.am
--- ./esc/src/lib/coolkey/Makefile.am.fix12	2021-09-27 15:26:24.130634037 -0700
-+++ ./esc/src/lib/coolkey/Makefile.am	2021-09-27 15:27:24.332545740 -0700
-@@ -24,7 +24,7 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-COOLKEY_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
-+COOLKEY_CFLAGS=-D_FORTIFY_SOURCE=2 $(ARCH_CFLAGS)
- 
- AM_CPPFLAGS += \
- 	$(COOLKEY_CFLAGS) \
-diff -up ./esc/src/lib/coolkey-mgr/Makefile.am.fix12 ./esc/src/lib/coolkey-mgr/Makefile.am
--- ./esc/src/lib/coolkey-mgr/Makefile.am.fix12	2021-09-27 15:34:18.400943562 -0700
-+++ ./esc/src/lib/coolkey-mgr/Makefile.am	2021-09-27 15:34:51.020896480 -0700
-@@ -24,7 +24,7 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-COOLKEY_MGR_CFLAGS=-fcf-protection=full
-+COOLKEY_MGR_CFLAGS=$(ARCH_CFLAGS)
- 
- OTHER_CPPFLAGS = -I ../coolkey $(PCSC_CFLAGS) $(COOLKEY_MGR_CFLAGS)
- OTHER_LIBS = -L../coolkey/.libs -lCoolkey-1.0 -L../nss-http-client/.libs -lNssHttpClient-1.0 $(DBUS_LIBS)
-diff -up ./esc/src/lib/nss-http-client/Makefile.am.fix12 ./esc/src/lib/nss-http-client/Makefile.am
--- ./esc/src/lib/nss-http-client/Makefile.am.fix12	2021-09-27 15:33:16.482032935 -0700
-+++ ./esc/src/lib/nss-http-client/Makefile.am	2021-09-27 15:34:04.524963592 -0700
-@@ -24,7 +24,7 @@ EXTRA_DIST =
- DISTCLEANFILES =
- lib_LTLIBRARIES =
- bin_PROGRAMS =
-NSS_HTTP_CLIENT_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
-+NSS_HTTP_CLIENT_CFLAGS=-D_FORTIFY_SOURCE=2 $(ARCH_CFLAGS)
- AM_CPPFLAGS += \
- 	$(NSS_HTTP_CLIENT_CFLAGS) \
- 	$(NULL)
--- a/SOURCES/esc-1.1.2-fix13.patch
+++ b/SOURCES/esc-1.1.2-fix13.patch
@ -1,104 +0,0 @@
-diff -up ./esc/src/app/esc.js.fix13 ./esc/src/app/esc.js
--- ./esc/src/app/esc.js.fix13	2022-06-29 16:03:45.002292355 -0700
-+++ ./esc/src/app/esc.js	2022-06-29 16:04:40.594027223 -0700
-@@ -581,7 +581,6 @@ class ESC {
-          this._configFile =  new GLib.KeyFile();
- 
-          this._configPath = GLib.get_user_config_dir() + "/esc";
-
-          let configDir = Gio.File.new_for_path(this._configPath);
- 
-          try {
-@@ -606,6 +605,9 @@ class ESC {
-              this._configFile.save_to_file(this._configFileName); 
-          } 
-      }
-+     _initConfigTokenManuIDs() {
-+        this._setConfigValue("esc.token.manu_id.0","Volkswagen AG");
-+     }
- 
-     _buildUI() {
-         // Create the application window
-@@ -637,6 +639,7 @@ class ESC {
- 
- 
-             this._initConfig();
-+            this._initConfigTokenManuIDs();
-             this._initProperties();
- 
-             this._statusMessages = null; 
-diff -up ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix13 ./esc/src/lib/coolkey/CoolKeyHandler.cpp
--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix13	2022-06-29 16:04:10.082172742 -0700
-+++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2022-06-29 16:04:40.595027219 -0700
-@@ -63,6 +63,7 @@ static const char *piv_manu_id_1=  "piv_
- static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("coolKeyHandler");
- 
- void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int description);
-+bool isTokenTypeOtherKnownType(CK_TOKEN_INFO *tokenInfo);
- 
- struct AutoCKYBuffer : public CKYBuffer
- {
-@@ -2246,6 +2247,7 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
-     int isACOOLKey = 0;
-     int isACAC = 0;
-     int isAPIV = 0;
-+    bool isOtherKey = false;
- 
-     int hasApplet = 0;
-     int isPersonalized = 0;
-@@ -2306,6 +2308,12 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
- 	isAPIV = 1;
-     } else {
-         isACOOLKey = 1;
-+        isOtherKey = isTokenTypeOtherKnownType(&tokenInfo);
-+        if(isOtherKey == true && hasApplet == 0 && isPersonalized == 0) {
-+            isACOOLKey = 0;
-+        } else {
-+            isOtherKey = false;
-+        }
-     }
- 
-     // OK, we have everything we need, now build the COOLKEYInfo structure.
-@@ -2336,7 +2344,7 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot,Co
-         tokenInfo.firmwareVersion.major = 1;    
-     }
- 
-    if(isPersonalized == 1 || isACAC == 1 || isAPIV == 1) {
-+    if(isPersonalized == 1 || isACAC == 1 || isAPIV == 1 || isOtherKey == true) {
-         tokenInfo.flags |= CKF_TOKEN_INITIALIZED;
-     }
- 
-@@ -2407,3 +2415,33 @@ failed:
-     
-     return NULL;
- }
-+
-+bool isTokenTypeOtherKnownType(CK_TOKEN_INFO *tokenInfo)
-+{
-+    char tBuff[56];
-+    bool res = false;
-+
-+    if(tokenInfo == NULL) {
-+        return res;
-+    }
-+    string curManuCfg;
-+    string num;
-+    for(int i = 0;;i++) {
-+        num = to_string(i);
-+        curManuCfg = "esc.token.manu_id." + num;
-+        const char *curManu = CoolKeyGetConfig(curManuCfg.c_str());
-+
-+        if(curManu == NULL) {
-+            break;
-+        }
-+
-+        int match = memcmp(tokenInfo->manufacturerID, curManu, strlen(curManu));
-+        CoolKeyFreeConfig(curManu);
-+        if(match == 0) {
-+            res = true;
-+            break;
-+        }
-+    }
-+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CoolKeyHandler::isTokenTypeOtherKnownType:  result: %d .\n",GetTStamp(tBuff,56), res));
-+    return res;
-+}
--- a/SOURCES/esc-gcc11.patch
+++ b/SOURCES/esc-gcc11.patch
@ -1,26 +0,0 @@
-diff --git a/esc/src/lib/coolkey/CoolKey_Message.cpp b/esc/src/lib/coolkey/CoolKey_Message.cpp
-index 87ee309..7b80f70 100644
--- a/esc/src/lib/coolkey/CoolKey_Message.cpp
-+++ b/esc/src/lib/coolkey/CoolKey_Message.cpp
-@@ -213,7 +213,7 @@ void  eCKMessage::setBinValue(string &aKey,unsigned char*aValue,int *aSize)
-     if(!aKey.length())
-         return;
- 
-    if(aSize <=0 || !aValue)
-+    if(aSize ==0 || !aValue)
-         return;
- 
-     string data = "";
-diff --git a/esc/src/lib/nss-http-client/request.cpp b/esc/src/lib/nss-http-client/request.cpp
-index cabd94f..5428350 100644
--- a/esc/src/lib/nss-http-client/request.cpp
-+++ b/esc/src/lib/nss-http-client/request.cpp
-@@ -192,7 +192,7 @@ PRBool PSHttpRequest::setBody(int size, const char* body) {
-     }
- 
-     _bodyLength = size;
-     sprintf(_body,body);
-+     sprintf(_body,"%s",body);
-     //_body = (char *)body;
- 
-     return PR_TRUE;
--- a/SOURCES/esc.desktop
+++ b/SOURCES/esc.desktop
@ -1,7 +1,8 @@
 [Desktop Entry]
 Type=Application
+Encoding=UTF-8
 Name=Smart Card Manager
 Comment=Enterprise Security Client Smart Card Manager
-Categories=System;
+Categories=System;Application;SystemSetup;X-Red-Hat-Base;
 Exec=esc
-Icon=esc
+Icon=esc.png
--- a/SPECS/esc.spec
+++ b/SPECS/esc.spec
@ -1,13 +1,12 @@
 Name: esc 
 Version: 1.1.2
-Release: 16%{?dist}
+Release: 24%{?dist}
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
 Group: Applications/Internet

 #Fix to harden linker flags.
-Patch0: esc-gcc11.patch
 Patch1: esc-1.1.2-fix1.patch
 Patch2: esc-1.1.2-fix2.patch
 Patch3: esc-1.1.2-fix3.patch
@ -19,8 +18,6 @@ Patch8: esc-1.1.2-fix8.patch
 Patch9: esc-1.1.2-fix9.patch
 Patch10: esc-1.1.2-fix10.patch
 Patch11: esc-1.1.2-fix11.patch
-Patch12: esc-1.1.2-fix12.patch
-Patch13: esc-1.1.2-fix13.patch


 #BuildRequires: doxygen fontconfig-devel
@ -31,21 +28,17 @@ BuildRequires: nspr-devel nss-devel nss-static

 BuildRequires: pcsc-lite-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-%if ! 0%{?rhel} >= 9
 BuildRequires: pkgconfig(gconf-2.0)
-%endif
 BuildRequires: dbus-glib-devel
 BuildRequires: glib2-devel
 BuildRequires: opensc
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk3-devel
 BuildRequires: gjs-devel
-BuildRequires: chrpath


-Requires: pcsc-lite >=  1.9.1-3
-Requires: pcsc-lite-ccid >= 1.4.34-4
+Requires: pcsc-lite >= 1.8.23-4.1
+Requires: pcsc-lite-ccid >= 1.4.29-5.1
 Requires: nss nspr
 Requires: dbus
 Requires: opensc
@ -84,7 +77,7 @@ cryptographic smartcards.
 %setup -q -c -n %{escname}

 #patch esc 
-%patch0 -p1
+
 %patch1 -p1 -b .fix1
 %patch2 -p1 -b .fix2
 %patch3 -p1 -b .fix3
@ -96,8 +89,6 @@ cryptographic smartcards.
 %patch9 -p1 -b .fix9
 %patch10 -p1 -b .fix10
 %patch11 -p1 -b .fix11
-%patch12 -p1 -b .fix12
-%patch13 -p1 -b .fix13


 %build
@ -110,6 +101,7 @@ cd esc
 ./autogen.sh
 make 
 %install
+
 echo "install section" $PWD
 cd esc
 make DESTDIR=$RPM_BUILD_ROOT install
@ -145,9 +137,6 @@ cp %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{appdir}
 cd %{_builddir}
 cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}

-#Get rid of rpath
-chrpath --delete $RPM_BUILD_ROOT/%{escdir}/lib/libcoolkeymgr-1.0.so
-

 %files
 %{!?_licensedir:%global license %%doc}
@ -168,42 +157,238 @@ chrpath --delete $RPM_BUILD_ROOT/%{escdir}/lib/libcoolkeymgr-1.0.so
 %{_datadir}/%{appdir}/esc.desktop

 %changelog
-* Wed Jun 29 2022 Jack Magne <jmagne@redhat.com> - 1.1.2-16
-Resolves: rhbs #2050849
- Bug 2050849 - Volkswagen Siemens CardOS M4.4 and 5.0 cards display incorrect status in ESC [RHEL 9.1]
-* Thu Dec 16 2021 Jack Magne <jmagne@redhat.com> - 1.1.2-15
-Resolves: rhbs #2007544,2000928,2000929
- Appease rpminspect
-* Tue Dec 13 2021 Jack Magne <jmagne@redhat.com> - 1.1.2-14
-Resolves: rhbs #2007544,2000928,2000929
- Bugzilla Bug  2007544 - The esc provides outdated configuration for opensc
- Bugzilla Bug  2000928 - ESC does not detect smart cards and crashes upon launch [rhel-9.0.0]
- Bugzilla Bug  2000929 - [RHEL-9][AppStream] esc present in comps but missing from repository [rhel-9.0.0] 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.2-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.2-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Tomas Popela <tpopela@redhat.com> - 1.1.2-9
- Don't enable GConf2 on RHEL 9 as it won't be available there.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Jeff Law <law@redhat.com> - 1.1.2-7
- Force C++14 as this code is not C++17 ready
- Fix sprintf format issue
- Fix ordered comparison of a pointer against zero issue
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Fri Jun 24 2022 Jack Magne <jmagne@redhat.com> - 1.1.2-24
+- Resolves: rhbz#1905691 - Volkswagen Siemens CardOS M4.4 and 5.0 cards display incorrect status in ESC.
+* Fri Jul 02 2021 Jack Magne <jmagne@redhat.com> - 1.1.2-23
+- Resolves: rhbz#1970565 - Create explicit pcsc-lite requrement to assure recent pcsc-lite fix [rhel-8.4.0.z], bump release # respin.
+- Adjust final pcsc-lite package requirement.
+* Fri Jun 25 2021 Jack Magne <jmagne@redhat.com> - 1.1.2-21
+- Resolves: rhbz#1970565 - Create explicit pcsc-lite requrement to assure recent pcsc-lite fix [rhel-8.4.0.z], bump release # respin.
+* Thu Jun 24 2021 Jack Magne <jmagne@redhat.com> - 1.1.2-20
+- Resolves: rhbz#1970565 - Create explicit pcsc-lite requrement to assure recent pcsc-lite fix [rhel-8.4.0.z]
+* Mon Nov 23 2020 Jack Magne <jmagne@redhat.com> - 1.1.2-15
+- Resolves: rhbz#1870715 - HP Keyboard does not list the certificates on an enrolled smart card.
+* 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
+- Resolves: rhbz#1646486 - alt tokens not detected by ESC
+- Resolves: rhbz#1774750 - ESC's unusual behavior after formatting a blank Gemalto token
+- Resolves: rhbz#1774770 - After formatting a Gemalto/SCP03 token, ESC shows incorrect Issuer, Issued To, Status, and Token ID details
+* Wed Nov 13 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-11
+- Resolves: rhbz#1724787 - ESC - HTTP GET Requests incorrectly Being Sent To TPS for Token Operations [8.2] 
+- Resolves: rhbz#1734117 - ESC does not detect/recognize both clean and formatted (with phone home) smart cards
+- Resolves: rhbz#1733645 - Gemalto, CAC, SCP01 cards are not detected by HP keyboard KUS1206 with builtin smartcard reader
+* Fri Jun 14 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-10
+- Resolves: rhbz#1679659 - esc changes blocked until gating tests are added.
+- Added notification list in yaml file, so entities are notified of changes.
+* Thu Apr 25 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-9
+- Resolves:  rhbz#1679659 - esc changes blocked until gating tests are added
+- Fixed the gating test string to adhere to format.
+* Mon Apr 15 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-8
+- Resolves:  rhbz#1679659 - esc changes blocked until gating tests are added
+* Fri Feb 01 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-7
+- #Related: Bug 1596915 - Remove XULRunner from ESC. Minor launch 
+- script fix.
+* Thu Jan 10 2019 Jack Magne <jmagne@redhat.com> - 1.1.2-6
+- #Resolve: Bug 1638011 - esc docdir should not be versioned in rhel8.
+- #Resolve: Bug 1596915 - Remove XULRunner from ESC. 
+* Fri Oct 12 2018 Jack Magne <jmagne@redhat.com> - 1.1.2-4
+- #Resolve: Bug 1633238 - ESC crashes when smartcard is detected.
+* Mon Oct 08 2018 Jack Magne <jmagne@redhat.com> - 1.1.2-4
+- #Resolve: Bug 1630560 - Review annocheck distro flag failures in esc.
+* Wed Aug 22 2018 Jack Magne <jmagne@redhat.com> - 1.1.2-3
+- Remove remaining arch exclusions.
+* Wed Aug 01 2018 Jack Magne <jmagne@redhat.com> - 1.1.2-1
+- Remove uneeded Requires and no longer put in autostart directory.
+* Mon Jul 30 2018 Jack Magne <jmagne@redhat.com> - 1.1.2-1
+- Build bare bones esc, without xulrunner, using gjs / gobject 
+- introspection.
+* Thu Jun 07 2018 Jack Magne <jmagne@redhat.com> - 1.1.1-5
+- Rebuild.
+* Mon Apr 23 2018 Jack Magne <jmagne@redhat.com> - 1.1.1-4 
+- Remove coolkey dependencies, replace with opensc.
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.1-2
+- Remove obsolete scriptlets
+
+* Mon Aug 07 2017 - 1.1.1-1
+- Rebuilt using internally built xulrunner, due to the xulrunner package going away.
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun May  8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-30
+- Secondary arch fixes
+- Use %%license
+
+* Mon Feb 08 2016 Jack Magne <jmagne@redhat.com> 1.1.0-29
+- Apease latest xullrunner api changes.
+
+* Thu Apr 09 2015 Jack Magne <jmagne@redhat.com> 1.1.0-27
+- More xulrunner adjustments.
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Apr 23 2014 Jack Magne <jmagne@redhat.com>=1.1.0-24
+- Fix minor http client error.
+* Thu Apr 17 2014 Jack Maghe <jmagne@redhat.com>=1.1.0-23
+- Appease more xulrunner changes.
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sun Jul  7 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.1.0-22
+- Make buildable with kernels > 3.5.
+- %%changelog syntax and bogus date fixes.
+- Bump xulrunner version to 22.0.
+
+* Mon Jun 17 2013 Jack Magne <jmagne@redhat.com>- 1.1.0-21
+- Appease latest compiler errors and build to xulrunner 21.0.
+* Wed Nov 28 2012 Jack Magne <jmagne@redhat.com>- 1.1.0-20
+- Gecko no longer supports UniversalXPConnect, remove it.
+* Wed Nov 21 2012 Jack Magne <jmagne@redhat.com>- 1.1.0-19
+- Pick up latest fixes.
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jun 22 2012   Jack Magne <jmagne@redhat.com>- 1.1.0-17
+- Related #688361 - Get ESC to run on Gecko 2.0, again.
+* Thu May 10 2012   Jack Magne <jmagne@redhat.com>- 1.1.0-16
+- Related #688361 - Get ESC to run on Gecko 2.0.
+* Mon Feb 20 2012   Jack Magne <jmagne@redhat.com>- 1.1.0-15
+- Related #688361 - Get ESC to run on Gecko 2.0.
+* Tue Nov 29 2011   Jack Magne <jmagne@redhat.com>- 1.1.0-14
+- Related #688361 - Get ESC to run on Gecko 2.0.
+* Thu Apr 15 2010   Jack Magne <jmagne@redhat.com>- 1.1.0-11
+- Adjust for new linking rules.
+* Tue Sep 15 2009   Jack Magne <jmagne@redhat.com>- 1.1.0-10
+- Pick up latest improvements.
+* Mon Jun 22 2009  Jack Magne <jmagne@redhat.com>- 1.1.0-9
+- Related: #496410, also IPV6 support.
+* Fri Jun 19 2009  Jack Magne <jmagne@redhat.com>- 1.1.0-8
+- Related: #496410, SSL Conn fix.
+* Mon Jun 8  2009  Jack Magne <jmagne@redhat.com>- 1.1.0-7
+- Releated: #496410.
+* Thu Apr 23 2009  Jack Magne <jmagne@redhat.com>- 1.1.0-6
+- Related: #496410. Appease rpmdiff.
+* Wed Apr 22 2009  Jack Magne <jmagne@redhat.com>- 1.1.0-5
+- Related: #496410, addresses 494981, better error message.
+* Wed Apr 22 2009  Jack Magne <jmagne@redhat.com>- 1.1.0-4
+- Move to latest rebased code. Related #496410.
+* Thu Dec 04 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-39
+- Resolves #469202 - Cert Viewer issue              
+* Tue Nov 11 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-38
+- Resolves  #471923 - ESC Connection issue.
+* Thu Oct 16 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-37
+- Resolves #467126 - Blank authentication dialog problem. 
+* Fri Sep 26 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-36
+- Related #200475 - Require the xulrunner package, Resolves #248493
+* Thu Sep 18 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-35
+- Related 200475, make rpmdiff tests happy.
+* Tue Sep 16 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-34
+- Resolves #200475 #253081 #437238
+* Thu Jan 10 2008  Jack Magne <jmagne@redhat.com>- 1.0.0-33
+- Resolves #25324a8 #253268
+* Thu Jul 12 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-32
+- Resolves #248071 - ESC RPM unistall failure if daemon not running.
+* Fri Jun 22 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-31
+- Related #208038 - Top things to put in diagnostics log
+* Wed Jun 20 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-30
+- Related #204021
+* Fri Jun 8 2007   Jack Magne <jmagne@redhat.com>- 1.0-0-29
+- Related #212010
+* Fri Jun 8 2007   Jack Magne <jmagne@redhat.com>- 1.0.0-28
+- Resolves #212010 
+* Tue Jun 5 2007   Jack Magne <jmagne@redhat.com>- 1.0.0-27 
+- Resolves #203466 Better error message strings.
+* Mon May 21 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-26
+- Related: #206783 Fix the launcher script to work with new logging.
+* Fri May 11 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-25
+- Resolves: #206783.
+* Mon Apr 23 2007 Jack Magne <jmagne@redhat.com>- 1.0.0-24
+- More Desktop appearance fixes.
+- Related: #208749
+* Mon Apr 23 2007  Jack Magne <jmagne@redhat.com>- 1.0.0-23
+- Desktop appearance fixes.
+- Related: #208749
+* Thu Apr 19 2007 Jack Magne <jmagne@redhat.com>- 1.0.0-22
+- Second drop of 5.1 fixes.
+- Resolves: #203934, #203935, #204959, #206780, #206792, #207721
+- Resolves: #207816, #206791
+- Related:  #208749
+* Wed Apr 18 2007 Jack Magne <jmagne@redhat.com>- 1.0.0-21
+- First 5.1 fixes.
+- Resolves: #203757, #203806, #204661, #205856, #206788, #206791
+- Resolves: #208037, #208333, #210589, #210590, #213912, #226913
+- Resolves: #204021, #205498, #224436
+* Tue Nov 28 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-20
+- fix for bug to commit config changes immediately.  Bug #210988
+* Wed Nov 15 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-19
+-fix for escd double free problem. Bug #209882
+* Tue Oct 24 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-18
+-rebuilt on RHEL-5 branch
+* Wed Oct 4  2006 Jack Magne <jmagne@redhat.com>- 1.0.0-17
+- Diagnostics display fixes, Mac and Window fixes.
+
+* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-16
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-15
+- Fix to the build version
+
+* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>= 1.0.0-14
+- Fix to compile error in daemon
+
+* Fri Sep 22 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-13
+- Fix to include the new esc daemon.  
+
+* Sat Sep 16 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-12
+- Fix for Password Reset and minor UI revision.
+
+* Fri Sep 15 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-11
+- Further UI enhancement bug fixes
+
+* Thu Sep 7 2006 Jack Magne <jmagne@redhat.com>- 1.0.0-10
+- Further strings revisions.
+
+* Wed Aug 30 2006 Jack Magne <jmagne@redhat.com>-  1.0.0-9
+- Revision of the strings used in ESC.
+
+* Wed Aug 30 2006 Jack Magne <jmagne@redhat.com>-  1.0.0-8
+- Fixes to get libnotify working properly on FC6 systems.
+
+* Tue Aug 22 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-7
+- Fix for bug #203211, use of system NSS and NSPR for
+- Xulrunner ,addressing the problem running on 64 bit.
+- Overwriting 5 and 6 due to important bug #203211.
+
+* Fri Aug  18 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-6
+- Correct problem with Patch #6
+
+* Fri Aug  18 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-5
+- Build ESC's xulrunner component using system nss and nspr
+- Build process creates run script based on {_libdir} variable,
+  accounting for differences on 64 bit machines.
+- UI enhancements
+
+* Tue Aug  1 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.0-4
+- Don't auto-generate requires either
+
+* Mon Jul 31 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.0-3
+- Don't provide mozilla libraries
+
+* Fri Jul 28 2006 Ray Strode <rstrode@redhat.com> - 1.0.0-2
+- remove bogus gtk+ requires (and some others that will
+  be automatic)
+
+* Tue Jun 13 2006 Jack Magne <jmagne@redhat.com> - 1.0.0-1
+- Initial revision for fedora
+