|
|
Author: jmagne
Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7325/devel
Modified Files:
esc.spec
Added Files:
esc-1.0.0-notify-icon-fixes.patch esc-1.0.0-ui-enhance.patch
Log Message:
auto-import esc-1.0.0-8 on branch devel from esc-1.0.0-8.src.rpm
esc-1.0.0-notify-icon-fixes.patch:
rpm/esc.spec | 29 +++++++++++++++------
src/app/xpcom/Makefile.moz | 2 -
src/app/xpcom/rhCoolKey.cpp | 2 -
src/app/xpcom/tray/rhLinuxTray.cpp | 4 ++
src/app/xul/esc/application.ini | 2 -
src/app/xul/esc/chrome/content/esc/ESC.js | 25 ++++++++++++++++--
src/app/xul/esc/chrome/content/esc/TRAY.js | 1
src/app/xul/esc/chrome/locale/en-US/esc.properties | 1
src/app/xul/esc/components/escCLH.js | 3 +-
src/lib/notifytray/notifyareaicon.c | 7 -----
src/lib/notifytray/notifytray.c | 13 ++++++++-
src/lib/notifytray/notifytray.h | 1
12 files changed, 69 insertions(+), 21 deletions(-)
--- NEW FILE esc-1.0.0-notify-icon-fixes.patch ---
--- ./esc/src/lib/notifytray/notifyareaicon.c.fix7 2006-08-26
21:10:45.000000000 -0700
+++ ./esc/src/lib/notifytray/notifyareaicon.c 2006-08-26 21:10:59.000000000
-0700
@@ -229,13 +229,6 @@
icon->tooltips = gtk_tooltips_new ();
- if(icon->tooltips)
- {
-
- gtk_tooltips_set_tip (icon->tooltips, icon, "Red Hat Enterprise Security
Client", NULL);
-
- }
-
return icon;
}
--- ./esc/src/lib/notifytray/notifytray.h.fix7 2006-08-26 21:12:00.000000000
-0700
+++ ./esc/src/lib/notifytray/notifytray.h 2006-08-26 21:12:09.000000000
-0700
@@ -26,5 +26,6 @@
extern int notify_icon_created_ok();
extern int notify_icon_show();
extern int notify_icon_hide();
+extern void notify_icon_set_static_tooltip(const char *message);
extern void notify_icon_send_tooltip_msg(const char *title,const char
*message,gint severity,gint timeout,const char *icon);
#endif /* _NOTIFY_TRAY_H_ */
--- ./esc/src/lib/notifytray/notifytray.c.fix7 2006-08-26 21:11:20.000000000
-0700
+++ ./esc/src/lib/notifytray/notifytray.c 2006-08-26 21:11:28.000000000
-0700
@@ -187,7 +187,18 @@
return 1;
}
-extern void notify_icon_send_tooltip_msg(const gchar *title,const gchar
*message,gint severity,gint timeout,const char* icon)
+void notify_icon_set_static_tooltip(const gchar *message)
+{
+ if(!message || !notify)
+ return;
+
+ if(notify->tooltips)
+ {
+ gtk_tooltips_set_tip (notify->tooltips, GTK_WIDGET(notify), message,
NULL);
+ }
+}
+
+void notify_icon_send_tooltip_msg(const gchar *title,const gchar *message,gint
severity,gint timeout,const char* icon)
{
if(!message || !notify)
return;
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix7 2006-08-26 21:01:02.000000000
-0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2006-08-26 21:01:10.000000000 -0700
@@ -1316,7 +1316,7 @@
{
PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
- char *version = "1.0.0";
+ char *version = "1.0.0-8";
char *versionVal = (char *) nsMemory::Clone(version,sizeof(char) *
strlen(version) + 1);
--- ./esc/src/app/xpcom/Makefile.moz.fix7 2006-08-26 21:00:24.000000000
-0700
+++ ./esc/src/app/xpcom/Makefile.moz 2006-08-26 21:00:32.000000000 -0700
@@ -177,7 +177,7 @@
endif
#cp -Rf -v $(XULRUNNER_BIN_PATH)
$(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)
- tar -xvf $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -C
$(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
+ tar -xzvf $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -C
$(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
ifeq ($(OS_ARCH),WINNT)
cp -f $(XPCOM_EXTRA) $(DEPLOY_OBJDIR)/ESC/components
endif
--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix7 2006-08-26
21:02:04.000000000 -0700
+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp 2006-08-26 21:02:15.000000000
-0700
@@ -193,6 +193,10 @@
/* void settooltipmsg (in string aMessage); */
NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
{
+
+ if(aMessage)
+ notify_icon_set_static_tooltip(aMessage);
+
return NS_OK;
}
--- ./esc/src/app/xul/esc/application.ini.fix7 2006-08-26 21:03:07.000000000
-0700
+++ ./esc/src/app/xul/esc/application.ini 2006-08-26 21:03:14.000000000
-0700
@@ -29,7 +29,7 @@
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=0000000000
+BuildID=0000000008
;
; 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.fix7 2006-08-26
21:05:00.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js 2006-08-26
21:05:11.000000000 -0700
@@ -3761,12 +3761,33 @@
function launchSETTINGS()
{
- var wind =
window.open("chrome://esc/content/settings.xul","","chrome,resizable,centerscreen,dialog");
+
+ var adminWnd = IsPageWindowPresent(ADMIN_WINDOW);
+
+ if(!adminWnd)
+ {
+ var wind =
window.open("chrome://esc/content/settings.xul","","chrome,resizable,centerscreen,dialog");
+
+ } else
+ {
+ adminWnd.focus();
+ }
}
function launchESC()
{
- var wind =
window.open("chrome://esc/content/esc.xul","","chrome,resizable,centerscreen,dialog");
+
+ var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW);
+
+ if(!enrollWnd)
+ {
+ var wind =
window.open("chrome://esc/content/esc.xul","","chrome,resizable,centerscreen,dialog");
+
+ }
+ else
+ {
+ enrollWnd.focus();
+ }
}
--- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix7 2006-08-26
21:05:46.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js 2006-08-26
21:05:57.000000000 -0700
@@ -357,6 +357,7 @@
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ gTray.settooltipmsg(getBundleString("escTitle"));
gTray.showicon();
} catch(e) {
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix7
2006-08-26 21:07:03.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties 2006-08-26
21:07:12.000000000 -0700
@@ -16,6 +16,7 @@
#ESC strings used in Javascript
#Strings for ESC.js
+escTitle=Red Hat Enterprise Security Client
enrolledKey=Enrolled Key
noKeysPresent=No Keys Present
blankKey=Blank Key
--- ./esc/src/app/xul/esc/components/escCLH.js.fix7 2006-08-26
21:08:29.000000000 -0700
+++ ./esc/src/app/xul/esc/components/escCLH.js 2006-08-26 21:08:39.000000000
-0700
@@ -50,7 +50,8 @@
if(win)
{
- recordMessage("Trying to open app more than once!");
+ recordMessage("Subsequent invocation. Launch an Admin page.");
+ win.launchSETTINGS();
return;
}
--- ./esc/rpm/esc.spec.fix7 2006-08-26 20:58:52.000000000 -0700
+++ ./esc/rpm/esc.spec 2006-08-26 20:59:06.000000000 -0700
@@ -1,6 +1,6 @@
Name: esc
Version: 1.0.0
-Release: 5%{?dist}
+Release: 8%{?dist}
Summary: Enterprise Security Client Smart Card Client
License: GPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -14,7 +14,7 @@
Patch4: firefox-1.1-nss-system-nspr.patch
Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
Patch6: esc-1.0.0-ui-enhance.patch
-
+Patch7: esc-1.0.0-notify-icon-fixes.patch
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -24,8 +24,9 @@
BuildRequires: pcsc-lite-devel coolkey-devel
BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: dbus-devel
Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip libnotify
+Requires: zip dbus >= 0.90 libnotify >= 0.4.2
# 390 does not have coolkey or smartCards
# Xulrunner won't compile on ppc64 right now.
@@ -66,7 +67,7 @@
%patch5 -p1 -b .fix5
%patch6 -p1 -b .fix6
-
+%patch7 -p1 -b .fix7
#Unpack xulrunner where esc expects it to be.
@@ -81,8 +82,6 @@
%patch3 -p1 -b .fix3
%patch4 -p1 -b .fix4
-
-
%build
%ifarch x86_64 ppc64 ia64
@@ -107,8 +106,10 @@
mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
mkdir -p $RPM_BUILD_ROOT/%{docdir}
+
sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} >
$RPM_BUILD_ROOT/%{escbindir}/%{name}
+
chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -174,12 +175,26 @@
fi
%changelog
-* Tue Aug 17 2006 Jack Magne <jmagne@xxxxxxxxxx> - 1.0.0-4
+* Sat Aug 22 2006 Jack Magne <jmagne@xxxxxxxxxx>- 1.0.0-8
+- Fixes to get libnotify working properly on FC6 systems.
+
+* Tue Aug 22 2006 Jack Magne <jmagne@xxxxxxxxxx> - 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@xxxxxxxxxx> - 1.0.0-6
+- Correct problem with Patch #6
+
+* Tue Aug 17 2006 Jack Magne <jmagne@xxxxxxxxxx> - 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@xxxxxxxxxx> - 1.0.0-4
+- Don't auto-generate requires either
+
* Mon Jul 31 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 1.0.0-3
- Don't provide mozilla libraries
esc-1.0.0-ui-enhance.patch:
rpm/esc | 10
rpm/esc.spec | 20
src/app/xpcom/Makefile.moz | 2
src/app/xpcom/rhCoolKey.cpp | 60 -
src/app/xpcom/tray/Makefile.moz | 8
src/app/xpcom/tray/rhITray.idl | 8
src/app/xpcom/tray/rhLinuxTray.cpp | 59 +
src/app/xpcom/tray/rhMacTray.cpp | 31
src/app/xpcom/tray/rhTray.cpp | 34 +
src/app/xul/esc/chrome/content/esc/ESC.js | 603 +++++++++++--------
src/app/xul/esc/chrome/content/esc/TRAY.js | 80 ++
src/app/xul/esc/chrome/content/esc/advancedinfo.xul | 2
src/app/xul/esc/chrome/content/esc/config.xul | 16
src/app/xul/esc/chrome/content/esc/esc.css | 21
src/app/xul/esc/chrome/content/esc/esc.xul | 21
src/app/xul/esc/chrome/content/esc/esc_browser.xul | 51 -
src/app/xul/esc/chrome/content/esc/hiddenWindow.html | 11
src/app/xul/esc/chrome/content/esc/hiddenWindow.xul | 26
src/app/xul/esc/chrome/content/esc/password.js | 4
src/app/xul/esc/chrome/content/esc/settings.xul | 19
src/app/xul/esc/chrome/locale/en-US/esc.dtd | 5
src/app/xul/esc/chrome/locale/en-US/esc.properties | 13
src/app/xul/esc/components/escCLH.js | 2
src/lib/NssHttpClient/request.cpp | 2
src/lib/NssHttpClient/response.cpp | 2
src/lib/coolkey/CoolKey.cpp | 20
src/lib/coolkey/CoolKeyHandler.cpp | 46 -
src/lib/coolkey/CoolKey_Message.cpp | 2
src/lib/coolkey/NSSManager.cpp | 11
src/lib/coolkey/SlotUtils.cpp | 2
src/lib/coolkey/SmartCardMonitoringThread.cpp | 5
src/lib/notifytray/Makefile | 7
src/lib/notifytray/manifest.mn | 7
src/lib/notifytray/notifyareaicon.c | 11
src/lib/notifytray/notifyareaicon.h | 4
src/lib/notifytray/notifytray.c | 75 ++
src/lib/notifytray/notifytray.h | 4
37 files changed, 825 insertions(+), 479 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 esc-1.0.0-ui-enhance.patch
Index: esc-1.0.0-ui-enhance.patch
===================================================================
RCS file: esc-1.0.0-ui-enhance.patch
diff -N esc-1.0.0-ui-enhance.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ esc-1.0.0-ui-enhance.patch 30 Aug 2006 03:43:44 -0000 1.4
@@ -0,0 +1,3262 @@
+--- ./esc/src/lib/coolkey/CoolKey_Message.cpp.fix6 2006-08-16
20:41:14.000000000 -0700
++++ ./esc/src/lib/coolkey/CoolKey_Message.cpp 2006-08-16 20:41:24.000000000
-0700
+@@ -22,7 +22,7 @@
+ #include "math.h"
+ #include <iostream>
+
+-PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("netkey");
++PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("coolKeyMessage");
+
+ void URLEncode(unsigned char *buf,char *ret, int *ret_len,int buff_len);
+ void URLDecode(char *buf,unsigned char *ret, int *ret_len,int buff_len);
+--- ./esc/src/lib/coolkey/NSSManager.cpp.fix6 2006-08-16 20:41:42.000000000
-0700
++++ ./esc/src/lib/coolkey/NSSManager.cpp 2006-08-16 20:42:13.000000000
-0700
+@@ -40,7 +40,7 @@
+
+ #include "SlotUtils.h"
+
+-static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS");
+
+ NSSManager::NSSManager()
+ {
+@@ -61,6 +61,9 @@
+ {
+ // Init NSS
+
++ PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("Initializing the NSS Crypto
Library. \n"));
++
++
+ if(aAppDir)
+ {
+ SECStatus status = NSS_Init(aAppDir);
+@@ -75,7 +78,7 @@
+
+ if(status != SECSuccess)
+ {
+- PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("InitNSS:Simple init
failed.\n"));
++ PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS:Simple init
failed.\n"));
+ return E_FAIL;
+ }
+ }
+@@ -87,7 +90,7 @@
+
+ char modSpec[512];
+
+- sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\"
NSS=\"slotParams=0x4=[slotFlags='PublicCerts']\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
++ sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\"
NSS=\"slotParams={0x00000002=[slotFlags='PublicCerts']}\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
+
+
+ PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: modSpec %s\n",modSpec));
+@@ -98,7 +101,7 @@
+
+ if(!userModule || !userModule->loaded)
+ {
+- PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("NSSManager::InitNSS problem
loading PKCS11 module. No keys will be recognized!\n"));
++ PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("NSSManager::InitNSS problem
loading PKCS11 module. No keys will be recognized!\n"));
+ return E_FAIL;
+ }
+
+--- ./esc/src/lib/coolkey/SlotUtils.cpp.fix6 2006-08-16 20:42:32.000000000
-0700
++++ ./esc/src/lib/coolkey/SlotUtils.cpp 2006-08-16 20:42:39.000000000
-0700
+@@ -44,7 +44,7 @@
+ static std::list<CoolKeyInfo*> gCoolKeyList;
+ PRLock *gCoolKeyListLock = NULL;
+
+-static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKeySlot");
+ #ifdef DEBUG
+ int gCoolKeyListLockCount = 0;
+ #endif // DEBUG
+--- ./esc/src/lib/coolkey/CoolKey.cpp.fix6 2006-08-16 20:39:26.000000000
-0700
++++ ./esc/src/lib/coolkey/CoolKey.cpp 2006-08-16 20:39:58.000000000 -0700
+@@ -36,7 +36,7 @@
+
+ static NSSManager* g_NSSManager = NULL;
+
+-static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("netkey");
++static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("coolKeyLib");
+
+ static std::list<CoolKeyListener*> g_Listeners;
+
+@@ -55,7 +55,7 @@
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:\n appDir %s",aAppDir));
+ if (g_NSSManager)
+ {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:g_NSSManager already
exists. \n"));
++ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:g_NSSManager already
exists. \n"));
+ return E_FAIL;
+ }
+
+@@ -72,7 +72,7 @@
+ HRESULT rv = g_NSSManager->InitNSS(aAppDir);
+ if (rv == E_FAIL)
+ {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:Failed to Init
NSSManager. \n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Failed to initialize Crypto
library! \n"));
+ return rv;
+ }
+
+@@ -855,7 +855,7 @@
+
+ assert(cardCtxt);
+ if (!cardCtxt) {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create
Card Context !.\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.
Can't create Card Context !.\n"));
+ result = E_FAIL;
+ goto done;
+ }
+@@ -863,7 +863,7 @@
+ conn = CKYCardConnection_Create(cardCtxt);
+ assert(conn);
+ if (!conn) {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create
Card Connection!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.
Can't create Card Connection!\n"));
+ result = E_FAIL;
+ goto done;
+ }
+@@ -871,14 +871,14 @@
+ readerName = GetReaderNameForKeyID(aKey);
+ assert(readerName);
+ if (!readerName) {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't get
reader name!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.
Can't get reader name!\n"));
+ result = E_FAIL;
+ goto done;
+ }
+
+ status = CKYCardConnection_Connect(conn, readerName);
+ if (status != CKYSUCCESS) {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't
connect to Card!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.
Can't connect to Card!\n"));
+
+ result = E_FAIL;
+ goto done;
+@@ -889,7 +889,7 @@
+ status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
+ if (status != CKYSUCCESS) {
+
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't select
CoolKey manager!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.
Can't select CoolKey manager!\n"));
+ goto done;
+ }
+
+@@ -898,7 +898,7 @@
+
+ if(status != CKYSUCCESS)
+ {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Error
actually getting IssuerInfo!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer
info. Error actually getting IssuerInfo!\n"));
+ result = E_FAIL;
+ goto done;
+ }
+@@ -914,7 +914,7 @@
+
+ if(infoSize >= (CKYSize ) aBufLen)
+ {
+- PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo::
Insufficient space to put Issuer Info!\n"));
++ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo::
Insufficient space to put Issuer Info!\n"));
+
+ result = E_FAIL;
+ goto done;
+--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix6 2006-08-16
20:43:11.000000000 -0700
++++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp 2006-08-16
20:43:25.000000000 -0700
+@@ -29,7 +29,7 @@
+
+ #include <assert.h>
+
+-static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKeySmart");
+
+ SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule *aModule)
+ : mModule(aModule), mThread(NULL)
+@@ -127,8 +127,7 @@
+
+
+ PR_LOG( coolKeyLogSC, PR_LOG_ALWAYS,
+- ("SmartCardMonitoringThread::Execute Token Event fired :"
+- " slot %p \n", slot));
++ ("SmartCard thread event detected. \n"));
+
+ if (slot == NULL) {
+
+--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix6 2006-08-16
20:40:24.000000000 -0700
++++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp 2006-08-16 20:40:35.000000000
-0700
+@@ -55,7 +55,7 @@
+ #define CKA_MOZILLA_ATR (CKO_NETSCAPE+25)
+ #endif
+
+-static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("netkey");
++static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("coolKeyHandler");
+
+ void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int
description);
+
[...2869 lines suppressed...]
++
++ }
++
++}
++
++
+ //String bundling related functions
+
+ function loadStringBundle()
+--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix6 2006-08-16
20:37:00.000000000 -0700
++++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd 2006-08-16
20:37:41.000000000 -0700
+@@ -54,7 +54,7 @@
+ <!ENTITY updateValues "Update Values">
+ <!ENTITY doTest "Test URL">
+ <!ENTITY escTitle "Red Hat Enterprise Security Client">
+-<!ENTITY pleaseEnroll "Enrolling Your Key">
++<!ENTITY pleaseEnroll "Security Key Enrollment">
+ <!ENTITY unenrolledDetected "Unenrolled Key Detected">
+ <!ENTITY noKeyDetected "No Key Detected">
+ <!ENTITY enrollMessage "To begin this enrollment process, you will need to
choose a password to protect the key. You will need to enter this password each
time you use your new key. You will also need to enter the security
information below needed by ESC to complete your enrollment.">
+@@ -74,6 +74,7 @@
+ <!ENTITY cancel "Cancel">
+ <!ENTITY closeEnrollLater "Close, I'll Enroll Later">
+ <!ENTITY closeAdminLater "Close">
++<!ENTITY closeNow "Close">
+ <!ENTITY enrollKeyNow "Enroll My Key Now">
+ <!ENTITY enrollKey "Enroll Key">
+ <!ENTITY administerKeys "Manage Keys">
+@@ -88,4 +89,4 @@
+ <!ENTITY getESCPassword "ESC Password Information">
+ <!ENTITY escOK "OK">
+ <!ENTITY escCancel "Cancel">
+-<!ENTITY tpsConfigDesc "ESC can not determine the location of the TPS
configuration for this key. Please enter the correct value.">
++<!ENTITY tpsConfigDesc "ESC has detected a totally blank key for which it
knows nothing about. ESC can not determine the location of the TPS information
for this key. Please enter the correct value so ESC can contact the TPS. The
correct value is of the form: http(s)://test.host.com:7888/home.cgi.">
+--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix6
2006-08-16 20:37:50.000000000 -0700
++++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties 2006-08-16
20:37:56.000000000 -0700
+@@ -34,10 +34,15 @@
+ tpsURI=TPS Server URL
+ tpsUI=TPS External UI URL
+ status=Status
++issuer=Issuer
++escLogEntries=ESC Log Entries
++noLogFileOrData=No Log File or Log File Has No Data.
+ certsOnToken=CERTIFICATES on KEY
+ certificateNickname=Certificate Nickname:
+ coolkeyComponentVersion=ESC Version
+ coolkeyDetectedNumberKeys=Number of Security Keys Detected
++enrolledDetected=Enrolled Key Detected
++enrolledDetectedMessage=ESC has detected an enrolled key. If you would rather
not re-enroll this key press "Close".
+ formatingToken=Formatting Key
+ enrollingToken=Enrolling Key
+ resettingTokenPIN=Resetting Key Pin
+@@ -45,6 +50,8 @@
+ blinkingToken=Blinking
+ keyInserted=Key Inserted!
+ keyRemoved=Key Removed!
++keyInsertedComputer=Security Key Inserted into the computer.
++keyRemovedComputer=Security Key Removed from the computer.
+ #ESC Error Messages from TPS
+ errorNone=Operation Completed Successfully.
+ serverError=Server Error.
+@@ -63,7 +70,7 @@
+ errorCommTokenDB=Cannot communicate with token database, try again later.
+ errorTokenDisabled=Token is disabled, contact techincal support.
+ errorPinReset=Cannot reset pin value for the token, contact technical support.
+-errorConnLost=Connection to server lost.
++errorConnLost=Connection to server lost. If problem persists, contact
technical support.
+ errorEntryTokenDB=Can not create entry for token in database, contact
technical support.
+ errorNoTokenState=No such token state, contact technical support.
+ errorInvalidLostTokenReason=Invalid lost token reason, contact technical
support.
+@@ -92,6 +99,7 @@
+ errorConfigValue=Error Getting Config Value:
+ errorSetConfigValue=Error SettingConfig Value:
+ errorBlankTPSURI=Blank Tps Uri submitted.
++noTpsConfigUrl=You must provide a Url to test!
+ aboutToTestTPSURI=About to test TPS URI:
+ errorSelectKey=Please select a key.
+ tpsURLContacted=TPS URL has been successfully contacted.
+@@ -102,7 +110,7 @@
+ errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try
again.
+ tpsConfigSuccess=TPS config information successfully obtained!
+ tpsConfigError=Error obtaining TPS config information!
+-tpsConfigTest=About to test the TSP config url :
++tpsConfigTest=About to test the TSP Phone Home Url :
+ tpsNoConfigUrl=Provide a valid TPS config URL!
+ tpsURIMustHaveValue=TPS URI item must have a value!
+ errorSetConfigValue=Error setting config value!:
+@@ -144,6 +152,7 @@
+ errorFindESCPlatform=Unable to determine ESC platform.
+ errorIssuerInfo=Error obtaining Issuer Info for key.
+ #Strings for TRAY.js
++errorTrayComponent=ESC can not be operated with its Icon in the notification
area. \n Please insert a Security Key to bring ESC to life.
+ errorTrayIsInitialized=Can't get if Tray is already intialized!
+ errorShowAllWindows=Error Showing All Windows:
+ errorHideAllWindows=Error Hiding all Windows:
+--- ./esc/src/app/xul/esc/components/escCLH.js.fix6 2006-08-16
20:38:29.000000000 -0700
++++ ./esc/src/app/xul/esc/components/escCLH.js 2006-08-16 20:38:53.000000000
-0700
+@@ -54,7 +54,7 @@
+ return;
+ }
+
+- var chromeURI = "chrome://esc/content/hiddenWindow.html";
++ var chromeURI = "chrome://esc/content/hiddenWindow.xul";
+
+ recordMessage(chromeURI);
+
+--- ./esc/rpm/esc.fix6 2006-08-16 20:14:22.000000000 -0700
++++ ./esc/rpm/esc 2006-08-16 20:19:32.000000000 -0700
+@@ -1,5 +1,11 @@
+ #!/bin/sh
+-export NSPR_LOG_MODULES=tray:2,coolkey:2,netkey:2,coolKey:2
++export
NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2
++
++if [ ! -d ~/.redhat/esc ]
++then
++mkdir -p ~/.redhat/esc
++fi
++
+ export NSPR_LOG_FILE=~/.redhat/esc/esc.log
+-cd /usr/lib/esc-1.0.0
++cd $LIBDIR/esc-1.0.0
+ ./esc
+--- ./esc/rpm/esc.spec.fix6 2006-08-16 20:12:33.000000000 -0700
++++ ./esc/rpm/esc.spec 2006-08-16 20:19:38.000000000 -0700
+@@ -1,6 +1,6 @@
+ Name: esc
+ Version: 1.0.0
+-Release: 4%{?dist}
++Release: 5%{?dist}
+ Summary: Enterprise Security Client Smart Card Client
+ License: GPL
+ URL: http://directory.fedora.redhat.com/wiki/CoolKey
+@@ -13,6 +13,7 @@
+ Patch3: firefox-1.5-with-system-nss.patch
+ Patch4: firefox-1.1-nss-system-nspr.patch
+ Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
++Patch6: esc-1.0.0-ui-enhance.patch
+
+
+ BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
+@@ -22,16 +23,16 @@
+ BuildRequires: autoconf213 libX11-devel libXt-devel
+
+ BuildRequires: pcsc-lite-devel coolkey-devel
+-BuildRequires: desktop-file-utils zip binutils
++BuildRequires: desktop-file-utils zip binutils libnotify-devel
+ Requires: pcsc-lite ifd-egate coolkey nss nspr
+-Requires: zip
++Requires: zip libnotify
+
+ # 390 does not have coolkey or smartCards
+ # Xulrunner won't compile on ppc64 right now.
+ ExcludeArch: s390 s390x ppc64
+
+ # We can't allow the internal xulrunner to leak out
+-AutoProv: 0
++AutoReqProv: 0
+
+ #%define __prelink_undo_cmd %{nil}
+ %define escname %{name}-%{version}
+@@ -64,6 +65,7 @@
+ #patch esc to use system nss and nspr.
+
+ %patch5 -p1 -b .fix5
++%patch6 -p1 -b .fix6
+
+
+ #Unpack xulrunner where esc expects it to be.
+@@ -92,7 +94,7 @@
+
+ cd ../..
+
+-make BUILD_OPT=1
++make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
+
+ %install
+
+@@ -105,7 +107,8 @@
+ mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
+ mkdir -p $RPM_BUILD_ROOT/%{docdir}
+
+-cp %{SOURCE1} $RPM_BUILD_ROOT/%{escbindir}
++sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} >
$RPM_BUILD_ROOT/%{escbindir}/%{name}
++
+ chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
+
+ mkdir -p $RPM_BUILD_ROOT/%{escdir}
+@@ -171,8 +174,11 @@
+ fi
+
+ %changelog
+-* Tue Aug 1 2006 Jack Magne <jmagne@xxxxxxxxxx> - 1.0.0-4
++* Tue Aug 17 2006 Jack Magne <jmagne@xxxxxxxxxx> - 1.0.0-4
+ - 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
+
+ * Mon Jul 31 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 1.0.0-3
+ - Don't provide mozilla libraries
Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- esc.spec 23 Aug 2006 15:59:42 -0000 1.11
+++ esc.spec 30 Aug 2006 03:43:44 -0000 1.12
@@ -1,6 +1,6 @@
Name: esc
Version: 1.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Enterprise Security Client Smart Card Client
License: GPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -13,6 +13,8 @@
Patch3: firefox-1.5-with-system-nss.patch
Patch4: firefox-1.1-nss-system-nspr.patch
Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+Patch6: esc-1.0.0-ui-enhance.patch
+Patch7: esc-1.0.0-notify-icon-fixes.patch
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -21,9 +23,10 @@
BuildRequires: autoconf213 libX11-devel libXt-devel
BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils
+BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: dbus-devel
Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip
+Requires: zip dbus >= 0.90 libnotify >= 0.4.2
# 390 does not have coolkey or smartCards
# Xulrunner won't compile on ppc64 right now.
@@ -63,6 +66,8 @@
#patch esc to use system nss and nspr.
%patch5 -p1 -b .fix5
+%patch6 -p1 -b .fix6
+%patch7 -p1 -b .fix7
#Unpack xulrunner where esc expects it to be.
@@ -88,7 +93,7 @@
cd ../..
-make BUILD_OPT=1
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
%install
@@ -170,6 +175,9 @@
fi
%changelog
+* Sat Aug 27 2006 Jack Magne <jmagne@xxxxxxxxxx>- 1.0.0-8
+- Fixes to get libnotify working properly on FC6 systems.
+
* Tue Aug 22 2006 Jack Magne <jmagne@xxxxxxxxxx> - 1.0.0-7
- Fix for bug #203211, use of system NSS and NSPR for
- Xulrunner ,addressing the problem running on 64 bit.
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|