diff --git a/.gitignore b/.gitignore index 6615204..bfd3723 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ esc-1.1.0.tar.bz2 +/esc-1.1.1.tar.bz2 +/esc-1.1.2.tar.bz2 diff --git a/esc b/esc index cb0d44d..293b861 100755 --- a/esc +++ b/esc @@ -18,153 +18,17 @@ # END COPYRIGHT BLOCK -DO_FORCEMODE="false" -DO_SHOW_VERSION="false" -ESC_ARGS= +ESC_PATH=/usr/lib64/esc-1.1.2 +ESC_BIN=esc.js +ESC_EXEC=gjs - -ESC_PROFILE_BASE=~/.redhat/esc -ESC_LOG_FILE=esc.log - -ESC_PATH=$LIBDIR/esc-1.1.0 -ESC_BIN_PATH=/usr/bin -ESC_EXEC=esc -ESCD_EXEC=escd - -ESC_BIN=$ESC_PATH/xulrunner/xulrunner-bin -ESCD_BIN=./$ESCD_EXEC - -LAST_PROG_PID=0 -SIGUSR1=10 - -FORCE_START_ESC= - -XPTI_DAT=xpti.dat -COMPREG_DAT=compreg.dat -LOCK_FILE=lock -PARENT_LOCK_FILE=.parentlock - -function isProgRunning { - - userID=$(whoami) - isProgRunning=$(pgrep -U $userID -f $1) - if [ $isProgRunning ]; - then - LAST_PROG_PID=$isProgRunning - return 0 - fi - LAST_PROG_PID=0 - return 1 -} - -function removeFile { - - rm -f $1 -} - -function cleanupProfile { - - removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT - removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT - removeFile $ESC_PROFILE_BASE/*default/$LOCK_FILE - removeFile $ESC_PROFILE_BASE/*default/$PARENT_LOCK_FILE - -} - -function processArgs { - - for arg in $1 - do - - #echo "theArg: $arg" - if [ $arg == "forceStartESC" ] - then - #echo "Do force mode!" - FORCE_START_ESC="true" - fi - - if [ $arg == "keyInserted" ] - then - FORCE_START_ESC="true" - fi - - if [ $arg == "-version" ] - then - #echo "Do show version!" - DO_SHOW_VERSION="true" - fi - done -} - - -processArgs $* - -if [ ! -d $ESC_PROFILE_BASE ] -then - mkdir -p $ESC_PROFILE_BASE -fi +export OPENSC_CONF=$ESC_PATH/opensc.esc.conf +export GI_TYPELIB_PATH=$ESC_PATH/lib/girepository-1.0 +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ESC_PATH/lib cd $ESC_PATH -#First check if we just want the version - -if [ $DO_SHOW_VERSION == "true" ] - then - #echo "try to run the version command!" - ESC_ARGS="-version" - ./$ESC_EXEC $ESC_ARGS - exit 0 -fi - -# Start up the daemon if it is not running - -isProgRunning $ESCD_BIN - -if [ $LAST_PROG_PID -gt 0 ] -then - false - #echo "escd already running." -else - #echo "escd not running start." - cleanupProfile - ./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\" --on_Signal=\"/usr/bin/esc\" - exit 0 -fi - -# Now check to see if we wer signaled from the daemon - -if [ $FORCE_START_ESC ] -then - #echo "force start esc." - - #Check to see if esc is already running - - isProgRunning $ESC_BIN - if [ $LAST_PROG_PID -gt 0 ] - then - #echo "attempting a force start but already running ... exit." - exit 0 - fi - #echo "force start esc not running start esc..." - ./$ESC_EXEC - exit 0 -fi - -isProgRunning $ESC_BIN - -if [ $LAST_PROG_PID -gt 0 ] -then - #echo "esc already running." - ./$ESC_EXEC - exit 0 -else - #echo "esc not already running start up and bring up window." - ./$ESC_EXEC & - sleep 4 - #echo "done sleeping bring up esc window." - ./$ESC_EXEC - exit 0 -fi +$ESC_EXEC ./$ESC_BIN & exit 0 diff --git a/esc-1.0.1-misc.patch b/esc-1.0.1-misc.patch deleted file mode 100644 index 6d75e35..0000000 --- a/esc-1.0.1-misc.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix8 2008-01-18 10:05:09.000000000 -0800 -+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2008-01-18 10:05:47.000000000 -0800 -@@ -817,7 +817,7 @@ - NS_IMETHODIMP rhCoolKey::ResetCoolKeyPIN(PRUint32 aKeyType, const char *aKeyID, const char *aScreenName, const char *aPIN, const char *aScreenNamePwd) - { - char tBuff[56]; -- ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Reset Key PIN, ID: %s \n",GetTStamp(tBuff,56),aKeyID); -+ ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Reset Key Password, ID: %s \n",GetTStamp(tBuff,56),aKeyID); - CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID); - - if (!node) ---- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix8 2008-01-18 10:06:00.000000000 -0800 -+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp 2008-01-18 10:06:09.000000000 -0800 -@@ -49,9 +49,15 @@ - char tBuff[56]; - GtkWidget *icon_box_widget = GTK_WIDGET(user_data); - -+ - if(icon_box_widget) - { -+ GdkScreen* gscreen = gdk_screen_get_default(); - GdkWindow* window = icon_box_widget->window; -+ -+ if(!window) -+ return; -+ - - gint width; - gint height; -@@ -59,20 +65,37 @@ - gint px; - gint py; - -+ gint screen_width = 0; -+ gint screen_height = 0; -+ -+ if(gscreen) -+ { -+ screen_width = gdk_screen_get_width(gscreen); -+ screen_height = gdk_screen_get_height(gscreen); -+ } -+ - gdk_drawable_get_size(window,&width,&height); - -- gdk_window_get_position(window, -+ gdk_window_get_origin(window, - &px, - &py); - -- PR_LOG( trayLog, PR_LOG_DEBUG, ("%s popup_position width %d height %d px %d py %d \n",GetTStamp(tBuff,56),width,height,px,py)); -+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s popup_position width %d height %d px %d py %d *x %d *y %d screen_w %d screen_h %d \n",GetTStamp(tBuff,56),width,height,px,py,*x,*y,screen_width, screen_height)); -+ -+ // Are we close to the bottom of the screen? - -+ if( screen_width > 0 && screen_height > 0 -+ && ( screen_height - py) < (height * 3)) -+ { -+ height = height* -2 ; -+ } - - gint x_coord = px; - gint y_coord = (py + height); - - *x = x_coord; - *y = y_coord; -+ *push_in = TRUE; - - } - ---- ./esc/src/app/xul/esc/application.ini.fix8 2008-01-18 10:04:33.000000000 -0800 -+++ ./esc/src/app/xul/esc/application.ini 2008-01-18 10:04:43.000000000 -0800 -@@ -25,11 +25,11 @@ - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.0.1-7 -+Version=1.0.1-8 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. --BuildID=0000001011 -+BuildID=0000001012 - ; - ; 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 diff --git a/esc-1.1.0-fix1.patch b/esc-1.1.0-fix1.patch deleted file mode 100644 index c7b631c..0000000 --- a/esc-1.1.0-fix1.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./esc/src/app/xpcom/tray/Makefile.sdk.fix1 2009-04-17 13:39:58.000000000 -0700 -+++ ./esc/src/app/xpcom/tray/Makefile.sdk 2009-04-17 14:18:17.000000000 -0700 -@@ -23,20 +23,20 @@ - include $(CORE_DEPTH)/coreconf/rules.mk - - ifeq ($(OS_ARCH),Linux) --CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -+CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC - endif - - - # Change this to point at your Gecko SDK directory. - ifndef GECKO_SDK_PATH --GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk -+GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9/sdk - endif - GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include - ifndef GECKO_INCLUDE_PATH --GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre -+GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9 - endif - ifndef GECKO_BIN_PATH --GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre -+GECKO_BIN_PATH=/usr/lib/xulrunner-1.9 - endif - - ifeq ($(OS_ARCH),Darwin) -@@ -148,6 +148,10 @@ - - endif - -+ifeq ($(OS_ARCH),Linux) -+GECKO_LD_LIBS= -L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a -+endif -+ - - # GCC only define which allows us to not have to #include mozilla-config - # in every .cpp file. If your not using GCC remove this line and add diff --git a/esc-1.1.0-fix10.patch b/esc-1.1.0-fix10.patch deleted file mode 100644 index f6eda05..0000000 --- a/esc-1.1.0-fix10.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix10 ./esc/src/app/xpcom/rhCoolKey.cpp ---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix10 2011-07-19 03:47:15.264254844 -0700 -+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-07-19 03:47:30.224254842 -0700 -@@ -542,7 +542,7 @@ PRBool rhCoolKey::InitInstance() - static const GREVersionRange greVersion = - { - "1.9", PR_TRUE, -- "2", PR_TRUE -+ "9.9", PR_TRUE - }; - - nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcom_path, 4096); -diff -up ./esc/src/app/xul/esc/application.ini.fix10 ./esc/src/app/xul/esc/application.ini ---- ./esc/src/app/xul/esc/application.ini.fix10 2011-07-19 03:42:23.368254822 -0700 -+++ ./esc/src/app/xul/esc/application.ini 2011-07-19 03:42:40.531254827 -0700 -@@ -25,11 +25,11 @@ Vendor=RedHat - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-13 -+Version=1.1.0-15 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. --BuildID=0000001013 -+BuildID=0000001015 - ; - ; 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 diff --git a/esc-1.1.0-fix11.patch b/esc-1.1.0-fix11.patch deleted file mode 100644 index bd6110e..0000000 --- a/esc-1.1.0-fix11.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -up ./esc/src/app/xpcom/Makefile.sdk.fix11 ./esc/src/app/xpcom/Makefile.sdk ---- ./esc/src/app/xpcom/Makefile.sdk.fix11 2011-09-16 11:28:43.413286053 -0700 -+++ ./esc/src/app/xpcom/Makefile.sdk 2011-09-16 11:28:43.529286053 -0700 -@@ -108,7 +108,7 @@ endif - ifeq ($(OS_ARCH),Linux) - CPPFLAGS += -fno-rtti \ - -fno-exceptions \ -- -fshort-wchar -fPIC -+ -fshort-wchar -fPIC -std=gnu++0x - GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnssutil3 -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl - endif - -@@ -129,6 +129,10 @@ ifdef ESC_VERSION - GECKO_DEFINES += -DESC_VERSION=$(ESC_VERSION) - endif - -+ifdef GECKO_BIN_PATH -+GECKO_DEFINES += -DGECKO_BIN_PATH=$(GECKO_BIN_PATH) -+endif -+ - NSS_INCLUDE = /usr/include/nss3 - NSPR_INCLUDE = /usr/include/nspr4 - -diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 ./esc/src/app/xpcom/rhCoolKey.cpp ---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 2011-09-16 11:28:43.510286053 -0700 -+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-09-16 11:28:43.530286053 -0700 -@@ -538,7 +538,7 @@ PRBool rhCoolKey::InitInstance() - - char xpcom_path[4096]; - xpcom_path[0] = 0; -- -+/* - static const GREVersionRange greVersion = - { - "1.9", PR_TRUE, -@@ -550,6 +550,13 @@ PRBool rhCoolKey::InitInstance() - return PR_FALSE; - } - -+*/ -+ -+ char *grePath = (char *) GETSTRING(GECKO_BIN_PATH); -+ -+ -+ snprintf(xpcom_path,4096,grePath); -+ - char *lib_name =(char *) XPCOM_LIB_NAME ; - - -diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 ./esc/src/app/xpcom/tray/Makefile.sdk ---- ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 2011-09-16 11:31:59.645286087 -0700 -+++ ./esc/src/app/xpcom/tray/Makefile.sdk 2011-09-16 11:32:10.859286088 -0700 -@@ -23,7 +23,7 @@ include $(CORE_DEPTH)/coreconf/config.mk - include $(CORE_DEPTH)/coreconf/rules.mk - - ifeq ($(OS_ARCH),Linux) --CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC -+CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC -std=gnu++0x - endif - - -diff -up ./esc/src/app/xul/esc/application.ini.fix11 ./esc/src/app/xul/esc/application.ini ---- ./esc/src/app/xul/esc/application.ini.fix11 2011-09-16 11:28:43.511286053 -0700 -+++ ./esc/src/app/xul/esc/application.ini 2011-09-16 11:28:43.532286053 -0700 -@@ -25,11 +25,11 @@ Vendor=RedHat - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-15 -+Version=1.1.0-16 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. --BuildID=0000001015 -+BuildID=0000001016 - ; - ; 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 -@@ -41,12 +41,12 @@ ID={6380471b-1924-4b48-b652-49f42951af86 - ; This field is required. It specifies the minimum Gecko version that this - ; application requires. Specifying 1.8 matches all releases with a version - ; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2). --MinVersion=1.99 -+MinVersion=6.0.0 - ; - ; This field is optional. It specifies the maximum Gecko version that this - ; application requires. It should be specified if your application uses - ; unfrozen interfaces. Specifying 1.8 matches all releases with a version - ; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2). --MaxVersion=2.99 -+MaxVersion=20.0.0 - - [Shell] diff --git a/esc-1.1.0-fix12.patch b/esc-1.1.0-fix12.patch deleted file mode 100644 index d40be5f..0000000 --- a/esc-1.1.0-fix12.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up ./esc/coreconf/Linux3.1.mk.fix12 ./esc/coreconf/Linux3.1.mk ---- ./esc/coreconf/Linux3.1.mk.fix12 2011-11-28 13:55:27.623816205 -0800 -+++ ./esc/coreconf/Linux3.1.mk 2011-11-28 13:56:11.119536737 -0800 -@@ -0,0 +1,35 @@ -+# BEGIN COPYRIGHT BLOCK -+# This Program is free software; you can redistribute it and/or modify it under -+# the terms of the GNU General Public License as published by the Free Software -+# Foundation; version 2 of the License. -+# -+# This Program is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along with -+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -+# Place, Suite 330, Boston, MA 02111-1307 USA. -+# -+# Copyright (C) 2005 Red Hat, Inc. -+# All rights reserved. -+# END COPYRIGHT BLOCK -+ -+# -+# Config stuff for Linux 3.1 (ELF) -+# -+ -+include $(CORE_DEPTH)/coreconf/Linux.mk -+ -+OS_REL_CFLAGS += -DLINUX2_1 -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+ifdef BUILD_OPT -+ OPTIMIZER = -O2 -+endif -+ -+ifdef MAPFILE -+ MKSHLIB += -Wl,--version-script,$(MAPFILE) -+endif -+PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ -+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ -+ -diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix12 ./esc/src/app/xpcom/rhCoolKey.cpp ---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix12 2011-11-28 19:29:53.894102752 -0800 -+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-11-28 19:30:46.003028405 -0800 -@@ -41,7 +41,6 @@ - #include "prlink.h" - #include "prthread.h" - #include "nscore.h" --#include "nsCopySupport.h" - #include - #include - #include diff --git a/esc-1.1.0-fix13.patch b/esc-1.1.0-fix13.patch deleted file mode 100644 index 94f9728..0000000 --- a/esc-1.1.0-fix13.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -up ./esc/coreconf/Linux3.2.mk.fix13 ./esc/coreconf/Linux3.2.mk ---- ./esc/coreconf/Linux3.2.mk.fix13 2012-02-20 18:08:55.637187190 -0800 -+++ ./esc/coreconf/Linux3.2.mk 2012-02-20 18:09:16.296139174 -0800 -@@ -0,0 +1,35 @@ -+# BEGIN COPYRIGHT BLOCK -+# This Program is free software; you can redistribute it and/or modify it under -+# the terms of the GNU General Public License as published by the Free Software -+# Foundation; version 2 of the License. -+# -+# This Program is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along with -+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -+# Place, Suite 330, Boston, MA 02111-1307 USA. -+# -+# Copyright (C) 2005 Red Hat, Inc. -+# All rights reserved. -+# END COPYRIGHT BLOCK -+ -+# -+# Config stuff for Linux 3.2 (ELF) -+# -+ -+include $(CORE_DEPTH)/coreconf/Linux.mk -+ -+OS_REL_CFLAGS += -DLINUX2_1 -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+ifdef BUILD_OPT -+ OPTIMIZER = -O2 -+endif -+ -+ifdef MAPFILE -+ MKSHLIB += -Wl,--version-script,$(MAPFILE) -+endif -+PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ -+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ -+ -diff -up ./esc/src/app/xpcom/Makefile.sdk.fix13 ./esc/src/app/xpcom/Makefile.sdk ---- ./esc/src/app/xpcom/Makefile.sdk.fix13 2012-02-20 18:01:49.522177961 -0800 -+++ ./esc/src/app/xpcom/Makefile.sdk 2012-02-20 18:01:49.526177952 -0800 -@@ -35,7 +35,12 @@ ifndef GECKO_BIN_PATH - GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre - endif - XUL_FRAMEWORK_BIN_PATH=$(GECKO_BIN_PATH) -- -+ifndef GECKO_IDL_PATH -+GECKO_IDL_PATH=/usr/share/idl/xulrunner-2 -+endif -+ifndef PYTHON_BIN_PATH -+PYTHON_BIN=python -+endif - - ifeq ($(OS_ARCH),Darwin) - ifndef GECKO_SDK_PATH -@@ -190,13 +195,14 @@ endif - all:: export libs - - libs:: -- $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhIKeyNotify.idl - -- $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhIKeyNotify.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/header.py --cachedir /tmp -o rhIKeyNotify.h -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhIKeyNotify.idl -+ -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/typelib.py --cachedir /tmp -o rhIKeyNotify.xpt -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhIKeyNotify.idl - -- $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhICoolKey.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/header.py --cachedir /tmp -o rhICoolKey.h -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhICoolKey.idl - -- $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhICoolKey.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/typelib.py --cachedir /tmp -o rhICoolKey.xpt -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhICoolKey.idl - - ifeq ($(OS_ARCH),Darwin) - $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) -diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix13 ./esc/src/app/xpcom/rhCoolKey.cpp ---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix13 2012-02-20 18:01:49.524177956 -0800 -+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2012-02-20 18:01:49.526177952 -0800 -@@ -98,6 +98,7 @@ static PRLogModuleInfo *coolKeyLog = PR_ - - rhCoolKey *single = NULL; - -+ - class CoolKeyShutdownObserver : public nsIObserver - { - public: -@@ -364,9 +365,9 @@ SECStatus rhCoolKey::badCertHandler(void - GetTStamp(tBuff,56),err,host,port) - ); - -- PRBool isTemporaryOverride = PR_FALSE; -+ bool isTemporaryOverride = PR_FALSE; - PRUint32 overrideBits = 0; -- PRBool overrideResult = PR_FALSE; -+ bool overrideResult = PR_FALSE; - - // Use the nsICertOverrideService to see if we have - // previously trusted this certificate. -@@ -554,14 +555,14 @@ PRBool rhCoolKey::InitInstance() - char *grePath = (char *) GETSTRING(GECKO_BIN_PATH); - - -- snprintf(xpcom_path,4096,grePath); -+ snprintf(xpcom_path,4096,"%s%s",grePath,"libxpcom.so"); - - char *lib_name =(char *) XPCOM_LIB_NAME ; - - - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::xpcom_path %s \n",GetTStamp(tBuff,56),xpcom_path)); - -- XPCOMGlueStartup(xpcom_path); -+ XPCOMGlueStartup("/usr/lib/xulrunner-2/libxpcom.so"); - - nssComponent - = do_GetService(PSM_COMPONENT_CONTRACTID); -@@ -1309,7 +1310,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyStatu - /* boolean GetCoolKeyIsReallyCoolKey (in unsigned long aKeyType, in string aKeyID); */ - - --NS_IMETHODIMP rhCoolKey::GetCoolKeyIsReallyCoolKey(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::GetCoolKeyIsReallyCoolKey(PRUint32 aKeyType, const char *aKeyID, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyIsReallyCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1328,7 +1329,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyIsRea - } - - /* long GetCoolKeyGetAppletVer (in unsigned long aKeyType, in string aKeyID, in boolean aIsMajor); */ --NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAppletVer(PRUint32 aKeyType, const char *aKeyID, PRBool aIsMajor, PRInt32 *_retval) -+NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAppletVer(PRUint32 aKeyType, const char *aKeyID, bool aIsMajor, PRInt32 *_retval) - { - char tBuff[56]; - PR_LOG(coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyAppletVer thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1344,7 +1345,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAp - - /* boolean rhCoolKeyIsEnrolled (in unsigned long aKeyType, in string aKeyID); */ - --NS_IMETHODIMP rhCoolKey::GetCoolKeyIsEnrolled(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::GetCoolKeyIsEnrolled(PRUint32 aKeyType, const char *aKeyID, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyIsEnrolled thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1586,7 +1587,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyIssue - } - - /* boolean SetCoolKeyConfigValue (in string aName, in string aValue); */ --NS_IMETHODIMP rhCoolKey::SetCoolKeyConfigValue(const char *aName, const char *aValue, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::SetCoolKeyConfigValue(const char *aName, const char *aValue, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::SetCoolKeyConfigValue thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1620,7 +1621,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyConfi - - /* boolean rhCoolKeyRequiresAuthentication (in unsigned long aKeyType, in string aKeyID); */ - --NS_IMETHODIMP rhCoolKey::GetCoolKeyRequiresAuthentication(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::GetCoolKeyRequiresAuthentication(PRUint32 aKeyType, const char *aKeyID, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyRequiresAuthentication thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1640,7 +1641,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyRequi - - /* boolean rhGetCoolKeyIsAuthenticated (in unsigned long aKeyType, in string aKeyID); */ - --NS_IMETHODIMP rhCoolKey::GetCoolKeyIsAuthenticated(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::GetCoolKeyIsAuthenticated(PRUint32 aKeyType, const char *aKeyID, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyIsAuthenticated thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -@@ -1660,7 +1661,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyIsAut - - /* boolean rhAuthenticateCoolKey (in unsigned long aKeyType, in string aKeyID, in string aPIN); */ - --NS_IMETHODIMP rhCoolKey::AuthenticateCoolKey(PRUint32 aKeyType, const char *aKeyID, const char *aPIN, PRBool *_retval) -+NS_IMETHODIMP rhCoolKey::AuthenticateCoolKey(PRUint32 aKeyType, const char *aKeyID, const char *aPIN, bool *_retval) - { - char tBuff[56]; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhAuthenticateCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread())); -diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix13 ./esc/src/app/xpcom/tray/Makefile.sdk ---- ./esc/src/app/xpcom/tray/Makefile.sdk.fix13 2012-02-20 18:01:49.522177961 -0800 -+++ ./esc/src/app/xpcom/tray/Makefile.sdk 2012-02-20 18:01:49.526177952 -0800 -@@ -39,6 +39,15 @@ ifndef GECKO_BIN_PATH - GECKO_BIN_PATH=/usr/lib/xulrunner-1.9 - endif - -+ifndef GECKO_IDL_PATH -+GECKO_IDL_PATH=/usr/share/idl/xulrunner-2 -+endif -+ -+ifndef PYTHON_BIN_PATH -+PYTHON_BIN=python -+endif -+ -+ - ifeq ($(OS_ARCH),Darwin) - ifndef GECKO_SDK_PATH - GECKO_SDK_PATH =/Users/jmagne/Desktop/gecko-sdk-mac-universal -@@ -220,13 +229,14 @@ all:: export libs - - libs:: - echo "PPC_BUILD $(PPC_BUILD)" -- $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhITray.idl - -- $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhITray.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/header.py --cachedir=/tmp -o rhITray.h -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhITray.idl -+ -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/typelib.py --cachedir=/tmp -o rhITray.xpt -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhITray.idl - -- $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhITrayWindNotify.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/header.py --cachedir=/tmp -o rhITrayWindNotify.h -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhITrayWindNotify.idl - -- $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhITrayWindNotify.idl -+ $(PYTHON_BIN) $(GECKO_SDK_PATH)/bin/typelib.py --cachedir=/tmp -o rhITrayWindNotify.xpt -I $(GECKO_IDL_PATH) -I $(NSPR_INCLUDE) rhITrayWindNotify.idl - - ifeq ($(OS_ARCH),Darwin) - $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) -diff -up ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix13 ./esc/src/app/xpcom/tray/rhLinuxTray.cpp ---- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix13 2012-02-20 18:01:49.512177984 -0800 -+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp 2012-02-20 18:01:49.526177952 -0800 -@@ -215,7 +215,7 @@ NS_IMETHODIMP rhTray::Show(nsIBaseWindow - return NS_OK; - } - --NS_IMETHODIMP rhTray::IsInitializedAlready(PRBool *_retval) -+NS_IMETHODIMP rhTray::IsInitializedAlready(bool *_retval) - { - *_retval = 0; - -@@ -749,7 +749,7 @@ void rhTray::NotifyTrayWindListeners(PRU - std::list< nsCOMPtr >::const_iterator it; - for(it=gTrayWindNotifyListeners.begin(); it!=gTrayWindNotifyListeners.end(); ++it) { - -- PRBool claimed = 0; -+ bool claimed = 0; - - PR_LOG( trayLog, PR_LOG_DEBUG, ("%s NotifyTrayWindListeners about to notify \n",GetTStamp(tBuff,56))); - ((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData, aKeyData, aData1, aData2, &claimed); -diff -up ./esc/src/app/xul/esc/application.ini.fix13 ./esc/src/app/xul/esc/application.ini ---- ./esc/src/app/xul/esc/application.ini.fix13 2012-02-20 18:01:49.523177958 -0800 -+++ ./esc/src/app/xul/esc/application.ini 2012-02-20 18:01:49.527177950 -0800 -@@ -25,7 +25,7 @@ Vendor=RedHat - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-16 -+Version=1.1.0-15 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. -diff -up ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix13 ./esc/src/app/xul/esc/chrome/content/esc/ESC.js ---- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix13 2012-02-20 18:01:49.514177980 -0800 -+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js 2012-02-20 18:01:49.527177950 -0800 -@@ -118,7 +118,7 @@ jsNotify.prototype = { - if(!iid.equals(Components.interfaces.rhIKeyNotify) && - !iid.equals(Components.interfaces.nsISupports)) - { -- MyAlert(getBundleString("errorJsNotifyInterface")); -+ //MyAlert(getBundleString("errorJsNotifyInterface")); - throw Components.results.NS_ERROR_NO_INTERFACE; - } - return this; -diff -up ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix13 ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js ---- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix13 2012-02-20 18:01:49.515177978 -0800 -+++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js 2012-02-20 18:01:49.528177948 -0800 -@@ -49,7 +49,7 @@ jsWindNotify.prototype = { - if(!iid.equals(Components.interfaces.rhITrayWindNotify) && - !iid.equals(Components.interfaces.nsISupports)) - { -- MyAlert(getBundleString("errorJsNotifyInterface")); -+ //MyAlert(getBundleString("errorJsNotifyInterface")); - throw Components.results.NS_ERROR_NO_INTERFACE; - } - return this; diff --git a/esc-1.1.0-fix2.patch b/esc-1.1.0-fix2.patch deleted file mode 100644 index f593dd2..0000000 --- a/esc-1.1.0-fix2.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix2 2009-04-18 13:19:20.000000000 -0700 -+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp 2009-04-18 13:20:23.000000000 -0700 -@@ -104,12 +104,16 @@ - char tBuff[56]; - PK11SlotInfo *slot; - -+ #ifdef LINUX -+ sleep(3); -+ #endif -+ - PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, - ("%s SmartCardMonitoringThread::Execute.\n",GetTStamp(tBuff,56))); - // - // populate token names for already inserted tokens. - // -- PK11SlotList *sl = -+ /* PK11SlotList *sl = - PK11_FindSlotsByNames(mModule->dllName, NULL, NULL, PR_TRUE); - PK11SlotListElement *sle; - -@@ -123,6 +127,8 @@ - PK11_FreeSlotList(sl); - } - -+ */ -+ - // loop starts.. - do { - ---- ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul.fix2 2009-04-18 13:21:34.000000000 -0700 -+++ ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul 2009-04-18 13:21:47.000000000 -0700 -@@ -24,7 +24,7 @@ - id="esc-window" - title="&genericAuthTitle;" - width="400" -- height="225" -+ height="240" - onload="UiLoad();" - onunload="UiUnload();" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> ---- ./esc/src/app/xul/esc/application.ini.fix2 2009-04-18 13:20:51.000000000 -0700 -+++ ./esc/src/app/xul/esc/application.ini 2009-04-18 13:21:02.000000000 -0700 -@@ -25,7 +25,7 @@ - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-1 -+Version=1.1.0-3 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. diff --git a/esc-1.1.0-fix3.patch b/esc-1.1.0-fix3.patch deleted file mode 100644 index 0dc60d3..0000000 --- a/esc-1.1.0-fix3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix3 2009-04-22 17:44:14.000000000 -0700 -+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties 2009-04-22 17:46:41.000000000 -0700 -@@ -104,7 +104,7 @@ - errorInvalidTokenTypeParams=The Smart Card Server cannot process the requested type of enrollment due to a misconfiguration. - errorCannotPublish=The Smart Card Server cannot publish your card's certificates to the certificate directory. - errorCommTokenDB=The Smart Card Server cannot connect to its internal database. --errorTokenSuspended=Your smart card has been suspended. -+errorTokenSuspended=You are not allowed to perform this operation with this smart card. - errorPinResetable=You are not allowed to reset the password of this smart card. - errorConnLost=The Smart Card Manager has lost the connection to the Smart Card Server. - errorEntryTokenDB=The Smart Card Server cannot add your smart card to its internal database. ---- ./esc/src/app/xul/esc/application.ini.fix3 2009-04-22 17:38:49.000000000 -0700 -+++ ./esc/src/app/xul/esc/application.ini 2009-04-22 17:39:14.000000000 -0700 -@@ -25,7 +25,7 @@ - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-3 -+Version=1.1.0-5 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. diff --git a/esc-1.1.0-fix4.patch b/esc-1.1.0-fix4.patch deleted file mode 100644 index 94f3255..0000000 --- a/esc-1.1.0-fix4.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./esc/src/lib/coolkey/manifest.mn.fix4 2009-04-23 14:13:21.000000000 -0700 -+++ ./esc/src/lib/coolkey/manifest.mn 2009-04-23 14:15:00.000000000 -0700 -@@ -27,7 +27,7 @@ - ifndef MOZ_OFFSET - MOZ_OFFSET = mozilla-1.7.13 - endif --DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -+DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing - MAPFILE = $(OBJDIR)/ckymanager.def - - #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet ---- ./esc/src/app/xul/esc/application.ini.fix4 2009-04-23 14:12:52.000000000 -0700 -+++ ./esc/src/app/xul/esc/application.ini 2009-04-23 14:13:01.000000000 -0700 -@@ -25,7 +25,7 @@ - Name=ESC - ; - ; This field specifies your application's version. This field is optional. --Version=1.1.0-5 -+Version=1.1.0-6 - ; - ; This field specifies your application's build ID (timestamp). This field is - ; required. diff --git a/esc-1.1.0-fix5.patch b/esc-1.1.0-fix5.patch deleted file mode 100644 index 8bf45a4..0000000 --- a/esc-1.1.0-fix5.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix5 2009-06-08 14:14:44.000000000 -0700 -+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp 2009-06-08 14:15:03.000000000 -0700 -@@ -159,7 +159,7 @@ - - /* if we think we have a token, but it's not the right one, or it's - * not there, then send a removal event */ -- if (info && (!isPresent || (info->mSeries != PK11_GetSlotSeries(slot))) ) { -+ if (info && !isPresent) { - - PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, - ("%s SmartCardMonitoringThread::Execute Token Removed : \n",GetTStamp(tBuff,56))); ---- ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul.fix5 2009-06-08 13:46:19.000000000 -0700 -+++ ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul 2009-06-08 13:46:33.000000000 -0700 -@@ -59,7 +59,6 @@ -