From nhosoi at fedoraproject.org Mon Feb 2 19:19:55 2009 From: nhosoi at fedoraproject.org (Noriko Hosoi) Date: Mon, 2 Feb 2009 19:19:55 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testdbinterop.c, 1.5, 1.6 testdbinterop.h, 1.5, 1.6 Message-ID: <20090202191955.6EA5570142@cvs1.fedora.phx.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27029 Modified Files: testdbinterop.c testdbinterop.h Log Message: Resolves: #483366 Summary: test plugin (datainterop): eliminate BDB dependency from testdbinterop Index: testdbinterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- testdbinterop.c 10 Nov 2006 23:45:50 -0000 1.5 +++ testdbinterop.c 2 Feb 2009 19:19:52 -0000 1.6 @@ -40,21 +40,21 @@ # include #endif - #include #include -#include "db.h" #include "testdbinterop.h" #include "slapi-plugin.h" -#define DATABASE "access.db" -static int number_of_keys=100; -static int key_buffer_size = 8000; - #define DB_PLUGIN_NAME "nullsuffix-preop" static PRLock *db_lock=NULL; +#ifdef USE_BDB +#include "db.h" +#define DATABASE "access.db" +static int number_of_keys=100; +static int key_buffer_size = 8000; + #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4100 #define DB_OPEN(db, txnid, file, database, type, flags, mode) \ (db)->open((db), (txnid), (file), (database), (type), (flags), (mode)) @@ -143,3 +143,70 @@ PR_Unlock(db_lock); } +#else /* USE_BDB */ +#include + +#define DATABASE "/tmp/testdbinterop.db" +#define DATABASE_BACK "/tmp/testdbinterop.db.bak" + +void +db_put_dn(char *data_dn) +{ + int ret; + char *db_path = DATABASE; + char *db_path_bak = DATABASE_BACK; + PRFileInfo info; + PRFileDesc *prfd; + PRInt32 data_sz; + char *data_dnp = NULL; + + if(db_lock == NULL){ + db_lock = PR_NewLock(); + } + PR_Lock(db_lock); + /* if db_path is a directory, rename it */ + ret = PR_GetFileInfo(db_path, &info); + if (PR_SUCCESS == ret) { + if (PR_FILE_DIRECTORY == info.type) { /* directory */ + ret = PR_GetFileInfo(db_path_bak, &info); + if (PR_SUCCESS == ret) { + if (PR_FILE_DIRECTORY != info.type) { /* not a directory */ + PR_Delete(db_path_bak); + } + } + PR_Rename(db_path, db_path_bak); + } + } + + /* open a file */ + if ((prfd = PR_Open(db_path, PR_RDWR | PR_CREATE_FILE | PR_APPEND, 0600)) == NULL ) { + slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME, + "db: Could not open file \"%s\" for read/write; %d (%s)\n", + db_path, PR_GetError(), slapd_pr_strerror(PR_GetError())); + return; + } + + data_dnp = slapi_ch_smprintf("%s\n", data_dn); + data_sz = (PRInt32)strlen(data_dnp); + + ret = PR_Write(prfd, data_dnp, data_sz); + if (ret == data_sz) { + slapi_log_error(SLAPI_LOG_PLUGIN, DB_PLUGIN_NAME, + "db: %s: key stored.\n", data_dn); + ret = 0; + } else { + slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME, + "db: Failed to store key \"%s\"; %d (%s)\n", + data_dn, PR_GetError(), slapd_pr_strerror(PR_GetError())); + ret = 1; + } + if(ret) { + slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME, + "db: Error detected in db_put_dn \n"); + } + slapi_ch_free_string(&data_dnp); + PR_Close(prfd); + PR_Unlock(db_lock); + return; +} +#endif Index: testdbinterop.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- testdbinterop.h 10 Nov 2006 23:45:50 -0000 1.5 +++ testdbinterop.h 2 Feb 2009 19:19:52 -0000 1.6 @@ -54,6 +54,5 @@ #include "nspr.h" -void create_db(); void db_put_dn(char *data); From rmeggins at fedoraproject.org Tue Feb 3 00:36:48 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Tue, 3 Feb 2009 00:36:48 +0000 (UTC) Subject: [Fedora-directory-commits] fedora-idm-console/win fedora-idm-console.bat, 1.2, 1.3 Message-ID: <20090203003648.7B06470142@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/fedora-idm-console/win In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/fedora-idm-console/win Modified Files: fedora-idm-console.bat Log Message: Reviewed by: nkinder (Thanks!) Fix Description: Just use "java -version" to test for the presence of java Platforms tested: Windows 2003 server Flag Day: no Doc impact: no Index: fedora-idm-console.bat =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/win/fedora-idm-console.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-idm-console.bat 14 Dec 2007 21:43:23 -0000 1.2 +++ fedora-idm-console.bat 3 Feb 2009 00:36:45 -0000 1.3 @@ -23,7 +23,7 @@ if not "%JAVA%foo"=="foo" goto launch -where java > nul 2>&1 || goto findjre +java -version > nul 2>&1 || goto findjre set JAVA=java goto launch From rmeggins at fedoraproject.org Tue Feb 3 16:19:10 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Tue, 3 Feb 2009 16:19:10 +0000 (UTC) Subject: [Fedora-directory-commits] fedora-idm-console build.properties, 1.2, 1.3 Message-ID: <20090203161910.5337B70144@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/fedora-idm-console In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24937 Modified Files: build.properties Log Message: Resolves: bug 476095 Description: upgrade components for rhds 8.1 Fix Description: Updated fedora-idm-console to version 1.1.2 Updated windows console to use the new wix version 2 (3 is currently still in beta) from wix.sourceforge.net Updated windows console to use new NSPR, NSS, JSS Updated windows console package to be able to upgrade an existing installation Updated Makefile to use the Windows bitsadmin program (provided in the XP or Server support package) to download components from the component filer Index: build.properties =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/build.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.properties 14 Jan 2008 19:33:08 -0000 1.2 +++ build.properties 3 Feb 2009 16:19:07 -0000 1.3 @@ -23,7 +23,7 @@ console.root=. console.version=11 -console.dotversion=1.1.1 +console.dotversion=1.1.2 console.dotgenversion=1.1 theme.core=fedora-idm-console From rmeggins at fedoraproject.org Tue Feb 3 16:19:10 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Tue, 3 Feb 2009 16:19:10 +0000 (UTC) Subject: [Fedora-directory-commits] fedora-idm-console/win Console.wxs, 1.2, 1.3 Makefile, 1.2, 1.3 Message-ID: <20090203161910.6898F70143@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/fedora-idm-console/win In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24937/win Modified Files: Console.wxs Makefile Log Message: Resolves: bug 476095 Description: upgrade components for rhds 8.1 Fix Description: Updated fedora-idm-console to version 1.1.2 Updated windows console to use the new wix version 2 (3 is currently still in beta) from wix.sourceforge.net Updated windows console to use new NSPR, NSS, JSS Updated windows console package to be able to upgrade an existing installation Updated Makefile to use the Windows bitsadmin program (provided in the XP or Server support package) to download components from the component filer Index: Console.wxs =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/win/Console.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Console.wxs 4 Sep 2007 21:30:54 -0000 1.2 +++ Console.wxs 3 Feb 2009 16:19:07 -0000 1.3 @@ -1,198 +1,234 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + NEWERFOUND + + + + + + + + Index: Makefile =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 4 Sep 2007 21:30:54 -0000 1.2 +++ Makefile 3 Feb 2009 16:19:07 -0000 1.3 @@ -1,101 +1,171 @@ -# -# 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. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# Packaging nmake Makefile for Console.msi - -PKGNAME=Console -PKGDIR=. -WXSDIR=. - -#BASEDIR=E:\cygwin\home\rich -# where to find nspr dlls -NSPRLIBDIR=$(BASEDIR)\nspr-4.6.7 -# where to find nss dlls -NSSLIBDIR=$(BASEDIR)\nss-3.11.7 -# where to find nss exes -NSSBINDIR=$(BASEDIR)\nss-3.11.7 -# where to find jss jar and dll -JSSDIR=$(BASEDIR)\jss-4.2.4 -# where to find the ldapjdk.jar -LDAPDIR=$(BASEDIR)\console -#LDAPDIR=$(BASEDIR)\ldapjdk-4.18 -# where to find the idm-console-framework jars -IDMDIR=$(BASEDIR)\console -# where to find the fedora-idm-console jar and other files -FEDORACONSOLEDIR=. - -WIXDIR=$(BASEDIR)\wix -CANDLE=$(WIXDIR)\candle -LIGHT=$(WIXDIR)\light - -ALL : $(PKGNAME).msi - -LAYOUT : - copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR) - copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR) - copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR) - copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR) - copy /Y $(JSSDIR)\jss4.jar $(PKGDIR) - copy /Y $(JSSDIR)\jss4.dll $(PKGDIR) - copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR) - copy /Y $(IDMDIR)\*.jar $(PKGDIR) - copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR) -# directory should already contain the bat file, icon, and bitmaps -# copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR) -# copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR) - -$(PKGNAME).msi : LAYOUT - cd "$(PKGDIR)" - $(CANDLE) "$(WXSDIR)\$(PKGNAME).wxs" - $(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl - -clean: - del /F /Q $(PKGNAME).wixobj $(PKGNAME).msi - -help: - @echo You must define the following paths: - @echo NSPRLIBDIR - directory containing the NSPR dlls - @echo NSSLIBDIR - directory containing the NSS dlls - @echo NSSBINDIR - directory containing certutil.exe and pk12util.exe - @echo JSSDIR - directory containing jss4.jar and jss4.dll - @echo LDAPDIR - directory containing ldapjdk.jar - @echo IDMDIR - directory containing the IDM Console Framework jar files - @echo FEDORACONSOLEDIR - directory containing the Fedora console jar file - @echo WIXDIR - directory containing the WiX candle.exe, light.exe, and library files - @echo Type 'nmake NSPRLIBDIR=... NSSLIBDIR=... etc.' to build the Console.msi package +# +# 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. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# Packaging nmake Makefile for Console.msi + +PKGNAME=Console +BRAND_PKGNAME=Fedora$(PKGNAME) +PKGDIR=. +WXSDIR=. + +# could also use wget or curl +DOWNLOAD="c:\program files\support tools\bitsadmin" /wrap /transfer consolebuild /download /priority normal +SBC=http://tsunami.dsdev.sjc.redhat.com/share/builds/components +SBV=http://tsunami.dsdev.sjc.redhat.com/share/builds/verification + +NSPRVER=4.7.3 +NSSVER=3_12_2 +LDAPJDKVER=4.18 +LDAPJDKVERDIR=4.18/20070817.1 +JSSVER=4_2_5 +JSSVERDIR=JSS_$(JSSVER)_RTM/20090122.1 +IDMVER=1.1 +IDMVERDIR=$(IDMVER)/20090122.1 +PLAT=WINNT5.0_OPT.OBJ + +PKGDIR="$(BASEDIR)\fedora-idm-console\win\build.$(PLAT)" + +#BASEDIR=E:\cygwin\home\rich +# where to find nspr dlls +NSPRLIBDIR="$(BASEDIR)\nspr-4.7.3\lib" +# where to find nss dlls +NSSLIBDIR="$(BASEDIR)\nss-3.12.2\lib" +# where to find nss exes +NSSBINDIR="$(BASEDIR)\nss-3.12.2\bin" +# where to find jss jar and dll +JSSDIR="$(BASEDIR)\jss-4.2.5" +# where to find the ldapjdk.jar +LDAPDIR="$(BASEDIR)\console" +#LDAPDIR=$(BASEDIR)\ldapjdk-4.18 +# where to find the idm-console-framework jars +IDMDIR="$(BASEDIR)\console" +# where to find the fedora-idm-console jar and other files +FEDORACONSOLEDIR=. + +WIXDIR="$(BASEDIR)\wix" +CANDLE=$(WIXDIR)\candle +LIGHT=$(WIXDIR)\light + +ALL : $(BRAND_PKGNAME).msi + +$(PKGDIR) : + mkdir $@ + mkdir $@\Bitmaps + +LAYOUT : $(PKGDIR) +# copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR) +# copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR) +# copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR) +# copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR) +# copy /Y $(JSSDIR)\jss4.jar $(PKGDIR) +# copy /Y $(JSSDIR)\jss4.dll $(PKGDIR) +# copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR) +# copy /Y $(IDMDIR)\*.jar $(PKGDIR) + copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR) +# directory should already contain the bat file, icon, and bitmaps + copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR) + copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR) + copy /Y $(FEDORACONSOLEDIR)\Bitmaps\* $(PKGDIR)\Bitmaps\* + copy /Y $(FEDORACONSOLEDIR)\License.rtf $(PKGDIR) + +DOWNLOAD : $(PKGDIR) +# NSPR + $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libnspr4.dll $(PKGDIR)/libnspr4.dll + $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplc4.dll $(PKGDIR)/libplc4.dll + $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplds4.dll $(PKGDIR)/libplds4.dll +# NSS + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nss3.dll $(PKGDIR)/nss3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/ssl3.dll $(PKGDIR)/ssl3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/smime3.dll $(PKGDIR)/smime3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssutil3.dll $(PKGDIR)/nssutil3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/freebl3.dll $(PKGDIR)/freebl3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/softokn3.dll $(PKGDIR)/softokn3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/sqlite3.dll $(PKGDIR)/sqlite3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssdbm3.dll $(PKGDIR)/nssdbm3.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssckbi.dll $(PKGDIR)/nssckbi.dll + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/pk12util.exe $(PKGDIR)/pk12util.exe + $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe +# JSS + $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(PLAT)/lib/jss4.dll $(PKGDIR)/jss4.dll + $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/jss4.jar $(PKGDIR)/jss4.jar +# LDAPJDK + $(DOWNLOAD) $(SBV)/ldapjdk/$(LDAPJDKVERDIR)/ldapjdk.jar $(PKGDIR)/ldapjdk.jar +# IDM + $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-base.jar $(PKGDIR)/idm-console-base.jar + $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc.jar $(PKGDIR)/idm-console-mcc.jar + $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc_en.jar $(PKGDIR)/idm-console-mcc_en.jar + $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf.jar $(PKGDIR)/idm-console-nmclf.jar + $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf_en.jar $(PKGDIR)/idm-console-nmclf_en.jar + +#$(PKGNAME).msi : LAYOUT DOWNLOAD +$(PKGNAME).msi : + cd $(PKGDIR) + cd + dir ..\$(PKGNAME).wxs + $(CANDLE) ..\$(PKGNAME).wxs + $(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl + +$(BRAND_PKGNAME).msi: $(PKGNAME).msi + cd $(PKGDIR) + del /F /Q $(BRAND_PKGNAME).msi + rename $(PKGNAME).msi $(BRAND_PKGNAME).msi + +clean: + del /F /Q $(PKGDIR) + +help: + @echo You must define the following paths: + @echo BASEDIR - the directory containing all of the other components' directories + @echo e.g. nmake BASEDIR="c:\Documents and Settings\userid" + @echo Use + @echo nmake BASEDIR=foo download + @echo to download the components from the default filer + @echo the download target will create $(PKGDIR) and place the files in there + @echo You will have to download the branded console jar file manually + @echo Or you may download them separately and specify individual directories: + @echo NSPRLIBDIR - directory containing the NSPR dlls + @echo NSSLIBDIR - directory containing the NSS dlls + @echo NSSBINDIR - directory containing certutil.exe and pk12util.exe + @echo JSSDIR - directory containing jss4.jar and jss4.dll + @echo LDAPDIR - directory containing ldapjdk.jar + @echo IDMDIR - directory containing the IDM Console Framework jar files + @echo FEDORACONSOLEDIR - directory containing the Fedora console jar file + @echo WIXDIR - directory containing the WiX candle.exe, light.exe, and library files + @echo Type 'nmake NSPRLIBDIR=... NSSLIBDIR=... etc.' to build the Console.msi package From nhosoi at fedoraproject.org Tue Feb 3 19:15:28 2009 From: nhosoi at fedoraproject.org (Noriko Hosoi) Date: Tue, 3 Feb 2009 19:15:28 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes phonetic.c, 1.6, 1.7 Message-ID: <20090203191528.E776D70141@cvs1.fedora.phx.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27683 Modified Files: phonetic.c Log Message: Resolves: #483668 Summary: Syntax plugin (phonetic): "Sounds like" does not support Western European characters Description: added a support for Latin-1 characters (UNICODE:00C0 - 00FF) Index: phonetic.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/phonetic.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- phonetic.c 12 Jan 2009 19:18:38 -0000 1.6 +++ phonetic.c 3 Feb 2009 19:15:26 -0000 1.7 @@ -230,268 +230,440 @@ /* N O P Q R S T U V W X Y Z */ /* Macros to access character coding array */ -#define vowel(x) ((x) != '\0' && vsvfn[(x) - 'A'] & 1) /* AEIOU */ +#define vowel(x) ((*(x) != '\0' && vsvfn[(*(x)) - 'A'] & 1) || /* AEIOU */ \ + (((*(x)==0xC3) && (*((x)+1))) ? ((0x80<=*((x)+1) && *((x)+1)<0x87) || \ + (0x88<=*((x)+1) && *((x)+1)<0x90) || (0x92<=*((x)+1) && *((x)+1)<0x97) || \ + (0x98<=*((x)+1) && *((x)+1)<0x9D) || (0xA0<=*((x)+1) && *((x)+1)<0xA7) || \ + (0xA8<=*((x)+1) && *((x)+1)<0xB0) || (0xB2<=*((x)+1) && *((x)+1)<0xB7) || \ + (0xB8<=*((x)+1) && *((x)+1)<0xBD)) : 0 ) /* Latin-1 characters */ ) +/* + case 0xC3: +*/ #define same(x) ((x) != '\0' && vsvfn[(x) - 'A'] & 2) /* FJLMNR */ #define varson(x) ((x) != '\0' && vsvfn[(x) - 'A'] & 4) /* CGPST */ -#define frontv(x) ((x) != '\0' && vsvfn[(x) - 'A'] & 8) /* EIY */ +#define frontv(x) ((*(x) != '\0' && vsvfn[(*(x)) - 'A'] & 8) || /* EIY */ \ + (((*(x)==0xC3) && (*((x)+1))) ? ((0x88<=*((x)+1) && *((x)+1)<0x90) || \ + (0xA8<=*((x)+1) && *((x)+1)<0xB0)) : 0 ) /* Latin-1 E/I */ ) #define noghf(x) ((x) != '\0' && vsvfn[(x) - 'A'] & 16) /* BDH */ char * phonetic( char *Word ) { - char *n, *n_start, *n_end; /* pointers to string */ - char *metaph_end; /* pointers to metaph */ - char ntrans[42]; /* word with uppercase letters */ - int KSflag; /* state flag for X -> KS */ - char buf[MAXPHONEMELEN + 2]; - char *Metaph; - - /* - * Copy Word to internal buffer, dropping non-alphabetic characters - * and converting to upper case - */ - n = ntrans + 4; n_end = ntrans + 35; - while (!iswordbreak( Word ) && n < n_end) { - if (isascii(*Word)) { - if (isalpha(*Word)) { - *n++ = TOUPPER(*Word); - } - ++Word; - } else { - auto const size_t len = LDAP_UTF8COPY(n, Word); - n += len; Word += len; + unsigned char *n, *n_start, *n_end; /* pointers to string */ + char *metaph_end; /* pointers to metaph */ + char ntrans[42]; /* word with uppercase letters */ + int KSflag; /* state flag for X -> KS */ + char buf[MAXPHONEMELEN + 2]; + char *Metaph; + + /* + * Copy Word to internal buffer, dropping non-alphabetic characters + * and converting to upper case + */ + n = ntrans + 4; n_end = ntrans + 35; + while (!iswordbreak( Word ) && n < n_end) { + if (isascii(*Word)) { + if (isalpha(*Word)) { + *n++ = TOUPPER(*Word); } + ++Word; + } else { + auto const size_t len = LDAP_UTF8COPY(n, Word); + n += len; Word += len; } - Metaph = buf; - *Metaph = '\0'; - if (n == ntrans + 4) { - return( slapi_ch_strdup( buf ) ); /* Return if null */ + } + Metaph = buf; + *Metaph = '\0'; + if (n == ntrans + 4) { + return( slapi_ch_strdup( buf ) ); /* Return if null */ + } + n_end = n; /* Set n_end to end of string */ + + /* ntrans[0] will always be == 0 */ + ntrans[0] = '\0'; + ntrans[1] = '\0'; + ntrans[2] = '\0'; + ntrans[3] = '\0'; + *n++ = 0; + *n++ = 0; + *n++ = 0; + *n = 0; /* Pad with nulls */ + n = ntrans + 4; /* Assign pointer to start */ + + /* Check for PN, KN, GN, AE, WR, WH, and X at start */ + switch (*n) { + case 'P': + case 'K': + case 'G': + /* 'PN', 'KN', 'GN' becomes 'N' */ + if (*(n + 1) == 'N') + *n++ = 0; + break; + case 'A': + /* 'AE' becomes 'E' */ + if (*(n + 1) == 'E') + *n++ = 0; + break; + case 'W': + /* 'WR' becomes 'R', and 'WH' to 'H' */ + if (*(n + 1) == 'R') + *n++ = 0; + else if (*(n + 1) == 'H') { + *n++ = 0; } - n_end = n; /* Set n_end to end of string */ + break; + case 'X': + /* 'X' becomes 'S' */ + *n = 'S'; + break; + case 0xC3: + switch (*(n+1)) { + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + *n++ = 0; + *n = 'A'; + break; + case 0x87: + *n++ = 0; + *n = 'C'; + break; + case 0x86: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + *n++ = 0; + *n = 'E'; + break; + case 0x8C: + case 0x8D: + case 0x8E: + case 0x8F: + *n++ = 0; + *n = 'I'; + break; + case 0x90: /* eth: TH */ + *n++ = 0; + *n = '0'; + break; + case 0x91: + *n++ = 0; + *n = 'N'; + break; + case 0x92: + case 0x93: + case 0x94: + case 0x95: + case 0x96: + case 0x98: + *n++ = 0; + *n = 'O'; + break; + case 0x99: + case 0x9A: + case 0x9B: + case 0x9C: + *n++ = 0; + *n = 'U'; + break; + case 0x9D: + *n++ = 0; + *n = 'Y'; + break; + case 0x9E: + *n++ = 0; + *n = '0'; /* thorn: TH */ + break; + case 0x9F: + *n++ = 0; + *n = 's'; + break; + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + *n++ = 0; + *n = 'a'; + break; + case 0xA6: + *n++ = 0; + *n = 'e'; + break; + case 0xA7: + *n++ = 0; + *n = 'c'; + break; + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + *n++ = 0; + *n = 'e'; + break; + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + *n++ = 0; + *n = 'i'; + break; + case 0xB0: + *n++ = 0; + *n = '0'; /* eth: th */ + break; + case 0xB1: + *n++ = 0; + *n = 'n'; + break; + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB8: + *n++ = 0; + *n = 'o'; + break; + case 0xB9: + case 0xBA: + case 0xBB: + case 0xBC: + *n++ = 0; + *n = 'u'; + break; + case 0xBD: + case 0xBF: + *n++ = 0; + *n = 'y'; + break; + case 0xBE: + *n++ = 0; + *n = '0'; /* thorn: th */ + break; + } + break; + } - /* ntrans[0] will always be == 0 */ - ntrans[0] = '\0'; - ntrans[1] = '\0'; - ntrans[2] = '\0'; - ntrans[3] = '\0'; - *n++ = 0; - *n++ = 0; - *n++ = 0; - *n = 0; /* Pad with nulls */ - n = ntrans + 4; /* Assign pointer to start */ - - /* Check for PN, KN, GN, AE, WR, WH, and X at start */ - switch (*n) { - case 'P': - case 'K': - case 'G': - /* 'PN', 'KN', 'GN' becomes 'N' */ - if (*(n + 1) == 'N') - *n++ = 0; - break; - case 'A': - /* 'AE' becomes 'E' */ - if (*(n + 1) == 'E') - *n++ = 0; - break; - case 'W': - /* 'WR' becomes 'R', and 'WH' to 'H' */ - if (*(n + 1) == 'R') - *n++ = 0; - else if (*(n + 1) == 'H') { - *(n + 1) = *n; - *n++ = 0; + /* + * Now, loop step through string, stopping at end of string or when + * the computed 'metaph' is MAXPHONEMELEN characters long + */ + + KSflag = 0; /* state flag for KS translation */ + for (metaph_end = Metaph + MAXPHONEMELEN, n_start = n; + n <= n_end && Metaph < metaph_end; n++) { + if (KSflag) { + KSflag = 0; + *Metaph++ = 'S'; + } else if (!isascii(*n)) { + switch (*n) { + case 0xC3: + if (n+1 <= n_end) { + switch (*(++n)) { + case 0x87: /* C with cedilla */ + case 0x9F: /* ess-zed */ + case 0xA7: /* c with cedilla */ + *Metaph++ = 'S'; + break; + case 0x90: /* eth: TH */ + case 0x9E: /* thorn: TH */ + case 0xB0: /* eth: th */ + case 0xBE: /* thorn: th */ + *Metaph++ = '0'; + break; + case 0x91: + case 0xB1: + *Metaph++ = 'N'; + break; + case 0x9D: + case 0xBD: + case 0xBF: + *Metaph++ = 'Y'; + break; + default: /* skipping the rest */ + break; + } } break; - case 'X': - /* 'X' becomes 'S' */ - *n = 'S'; - break; - } + default: + *Metaph++ = *n; + } + } else { + /* Drop duplicates except for CC */ + if (*(n - 1) == *n && *n != 'C') + continue; + /* Check for F J L M N R or first letter vowel */ + if (same(*n) || (n == n_start && vowel(n))) { + *Metaph++ = *n; + } else { + switch (*n) { + case 'B': - /* - * Now, loop step through string, stopping at end of string or when - * the computed 'metaph' is MAXPHONEMELEN characters long - */ - - KSflag = 0; /* state flag for KS translation */ - for (metaph_end = Metaph + MAXPHONEMELEN, n_start = n; - n <= n_end && Metaph < metaph_end; n++) { - if (KSflag) { - KSflag = 0; - *Metaph++ = 'S'; - } else if (!isascii(*n)) { + /* + * B unless in -MB + */ + if (n < (n_end - 1) && *(n - 1) != 'M') { *Metaph++ = *n; - } else { - /* Drop duplicates except for CC */ - if (*(n - 1) == *n && *n != 'C') - continue; - /* Check for F J L M N R or first letter vowel */ - if (same(*n) || (n == n_start && vowel(*n))) { - *Metaph++ = *n; + } + break; + case 'C': + + /* + * X if in -CIA-, -CH- else S if in + * -CI-, -CE-, -CY- else dropped if + * in -SCI-, -SCE-, -SCY- else K + */ + if (*(n - 1) != 'S' || !frontv((n + 1))) { + if (*(n + 1) == 'I' && *(n + 2) == 'A') { + *Metaph++ = 'X'; + } else if (frontv((n + 1))) { + *Metaph++ = 'S'; + } else if (*(n + 1) == 'H') { + *Metaph++ = ((n == n_start && !vowel((n + 2))) + || *(n - 1) == 'S') + ? (char) 'K' : (char) 'X'; } else { - switch (*n) { - case 'B': - - /* - * B unless in -MB - */ - if (n < (n_end - 1) && *(n - 1) != 'M') { - *Metaph++ = *n; - } - break; - case 'C': - - /* - * X if in -CIA-, -CH- else S if in - * -CI-, -CE-, -CY- else dropped if - * in -SCI-, -SCE-, -SCY- else K - */ - if (*(n - 1) != 'S' || !frontv(*(n + 1))) { - if (*(n + 1) == 'I' && *(n + 2) == 'A') { - *Metaph++ = 'X'; - } else if (frontv(*(n + 1))) { - *Metaph++ = 'S'; - } else if (*(n + 1) == 'H') { - *Metaph++ = ((n == n_start && !vowel(*(n + 2))) - || *(n - 1) == 'S') - ? (char) 'K' : (char) 'X'; - } else { - *Metaph++ = 'K'; - } - } - break; - case 'D': - - /* - * J if in DGE or DGI or DGY else T - */ - *Metaph++ = (*(n + 1) == 'G' && frontv(*(n + 2))) - ? (char) 'J' : (char) 'T'; - break; - case 'G': - - /* - * F if in -GH and not B--GH, D--GH, - * -H--GH, -H---GH else dropped if - * -GNED, -GN, -DGE-, -DGI-, -DGY- - * else J if in -GE-, -GI-, -GY- and - * not GG else K - */ - if ((*(n + 1) != 'J' || vowel(*(n + 2))) && - (*(n + 1) != 'N' || ((n + 1) < n_end && - (*(n + 2) != 'E' || *(n + 3) != 'D'))) && - (*(n - 1) != 'D' || !frontv(*(n + 1)))) - *Metaph++ = (frontv(*(n + 1)) && - *(n + 2) != 'G') ? (char) 'G' : (char) 'K'; - else if (*(n + 1) == 'H' && !noghf(*(n - 3)) && - *(n - 4) != 'H') - *Metaph++ = 'F'; - break; - case 'H': - - /* - * H if before a vowel and not after - * C, G, P, S, T else dropped - */ - if (!varson(*(n - 1)) && (!vowel(*(n - 1)) || - vowel(*(n + 1)))) - *Metaph++ = 'H'; - break; - case 'K': - - /* - * dropped if after C else K - */ - if (*(n - 1) != 'C') - *Metaph++ = 'K'; - break; - case 'P': - - /* - * F if before H, else P - */ - *Metaph++ = *(n + 1) == 'H' ? - (char) 'F' : (char) 'P'; - break; - case 'Q': - - /* - * K - */ - *Metaph++ = 'K'; - break; - case 'S': - - /* - * X in -SH-, -SIO- or -SIA- else S - */ - *Metaph++ = (*(n + 1) == 'H' || - (*(n + 1) == 'I' && (*(n + 2) == 'O' || - *(n + 2) == 'A'))) - ? (char) 'X' : (char) 'S'; - break; - case 'T': - - /* - * X in -TIA- or -TIO- else 0 (zero) - * before H else dropped if in -TCH- - * else T - */ - if (*(n + 1) == 'I' && (*(n + 2) == 'O' || - *(n + 2) == 'A')) - *Metaph++ = 'X'; - else if (*(n + 1) == 'H') - *Metaph++ = '0'; - else if (*(n + 1) != 'C' || *(n + 2) != 'H') - *Metaph++ = 'T'; - break; - case 'V': - - /* - * F - */ - *Metaph++ = 'F'; - break; - case 'W': - - /* - * W after a vowel, else dropped - */ - case 'Y': - - /* - * Y unless followed by a vowel - */ - if (vowel(*(n + 1))) - *Metaph++ = *n; - break; - case 'X': - - /* - * KS - */ - if (n == n_start) - *Metaph++ = 'S'; - else { - *Metaph++ = 'K'; /* Insert K, then S */ - KSflag = 1; - } - break; - case 'Z': - - /* - * S - */ - *Metaph++ = 'S'; - break; - } + *Metaph++ = 'K'; } + } + break; + case 'D': + + /* + * J if in DGE or DGI or DGY else T + */ + *Metaph++ = (*(n + 1) == 'G' && frontv((n + 2))) + ? (char) 'J' : (char) 'T'; + break; + case 'G': + + /* + * F if in -GH and not B--GH, D--GH, + * -H--GH, -H---GH else dropped if + * -GNED, -GN, -DGE-, -DGI-, -DGY- + * else J if in -GE-, -GI-, -GY- and + * not GG else K + */ + if ((*(n + 1) != 'J' || vowel((n + 2))) && + (*(n + 1) != 'N' || ((n + 1) < n_end && + (*(n + 2) != 'E' || *(n + 3) != 'D'))) && + (*(n - 1) != 'D' || !frontv((n + 1)))) + *Metaph++ = (frontv((n + 1)) && + *(n + 2) != 'G') ? (char) 'G' : (char) 'K'; + else if (*(n + 1) == 'H' && !noghf(*(n - 3)) && + *(n - 4) != 'H') + *Metaph++ = 'F'; + break; + case 'H': + + /* + * H if before a vowel and not after + * C, G, P, S, T else dropped + */ + if (!varson(*(n - 1)) && (!vowel((n - 1)) || + vowel((n + 1)))) + *Metaph++ = 'H'; + break; + case 'K': + + /* + * dropped if after C else K + */ + if (*(n - 1) != 'C') + *Metaph++ = 'K'; + break; + case 'P': + + /* + * F if before H, else P + */ + *Metaph++ = *(n + 1) == 'H' ? + (char) 'F' : (char) 'P'; + break; + case 'Q': + + /* + * K + */ + *Metaph++ = 'K'; + break; + case 'S': + + /* + * X in -SH-, -SIO- or -SIA- else S + */ + *Metaph++ = (*(n + 1) == 'H' || + (*(n + 1) == 'I' && (*(n + 2) == 'O' || + *(n + 2) == 'A'))) + ? (char) 'X' : (char) 'S'; + break; + case 'T': + + /* + * X in -TIA- or -TIO- else 0 (zero) + * before H else dropped if in -TCH- + * else T + */ + if (*(n + 1) == 'I' && (*(n + 2) == 'O' || + *(n + 2) == 'A')) + *Metaph++ = 'X'; + else if (*(n + 1) == 'H') + *Metaph++ = '0'; + else if (*(n + 1) != 'C' || *(n + 2) != 'H') + *Metaph++ = 'T'; + break; + case 'V': + + /* + * F + */ + *Metaph++ = 'F'; + break; + case 'W': + + /* + * W after a vowel, else dropped + */ + case 'Y': + + /* + * Y unless followed by a vowel + */ + if (vowel((n + 1))) + *Metaph++ = *n; + break; + case 'X': + + /* + * KS + */ + if (n == n_start) + *Metaph++ = 'S'; + else { + *Metaph++ = 'K'; /* Insert K, then S */ + KSflag = 1; + } + break; + case 'Z': + + /* + * S + */ + *Metaph++ = 'S'; + break; } + } } + } - *Metaph = 0; /* Null terminate */ - return( slapi_ch_strdup( buf ) ); + *Metaph = 0; /* Null terminate */ + return( slapi_ch_strdup( buf ) ); } #endif /* METAPHONE */ From jmagne at fedoraproject.org Wed Feb 4 01:30:30 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:30:30 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 setup.iss, 1.3, 1.4 build.sh, 1.5, 1.6 Message-ID: <20090204013030.37A3570141@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14651 Modified Files: setup.iss build.sh Log Message: Latest rhel fixes. Index: setup.iss =================================================================== RCS file: /cvs/dirsec/esc/win32/setup.iss,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- setup.iss 6 Mar 2008 00:11:07 -0000 1.3 +++ setup.iss 4 Feb 2009 01:30:27 -0000 1.4 @@ -1,34 +1,17 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -; 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 - [Setup] AppName=Smart Card Manager AppMutex=ESCMutex -AppVerName=Smart Card Manager 1.0.1-6 -AppPublisher=Fedora +AppVerName=Smart Card Manager 1.1.0-1 +AppPublisher=Fedora. CreateAppDir=true Compression=lzma SolidCompression=true MinVersion=0,5.0.2195 ShowLanguageDialog=yes -OutputBaseFilename=SmartCardManagerSetup-1.0.1-6.win32.i386 +OutputBaseFilename=SmartCardManagerSetup-1.1.0-1.win32.i386 DefaultDirName={pf}\Fedora\ESC DisableProgramGroupPage=false DefaultGroupName=Fedora @@ -42,7 +25,7 @@ InfoBeforeFile=info-before.txt InfoAfterFile=info-after.txt PrivilegesRequired=admin -VersionInfoVersion=1.0.1.6 +VersionInfoVersion=1.1.0.1 [Files] @@ -75,8 +58,8 @@ Source: BUILD\mfc71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist ; NOTE: Don't use "Flags: ignoreversion" on any shared system files -Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components -Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components +;Source: BUILD\ESC\components\rhTray.xpt; DestDir: {app}\components +;Source: BUILD\ESC\components\rhCoolKey.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhICoolKey.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhIKeyNotify.xpt; DestDir: {app}\components Source: BUILD\ESC\components\rhITray.xpt; DestDir: {app}\components @@ -86,7 +69,7 @@ Source: BUILD\ESC\components\rhCoolKey.dll; DestDir: {app}\components Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace -Source: BUILD\zlib1.dll;DestDir: {sys}; Flags: restartreplace +Source: BUILD\zlib1.dll; DestDir: {sys}; Flags: restartreplace ;Source: BUILD\coolkeypk11.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\esc.exe; DestDir: {app} ;Source: BUILD\ESC\esc.bat; Destdir: {app} @@ -120,7 +103,6 @@ Source: BUILD\ESC\xulrunner\chrome\pippki.jar; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\pippki.manifest; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\chrome\toolkit.jar; DestDir: {app}\xulrunner\chrome -Source: BUILD\ESC\xulrunner\chrome\chromelist.txt; DestDir: {app}\xulrunner\chrome Source: BUILD\ESC\xulrunner\xulrunner-stub.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\dependentlibs.list; DestDir: {app}\xulrunner ;Source: BUILD\ESC\xulrunner\GenerateJavaInterfaces.exe; DestDir: {app}\xulrunner @@ -147,18 +129,14 @@ Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\xpicleanup.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xul.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xulrunner.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\AccessibleMarshal.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\components\xulutil.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\accessibility-msaa.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\alerts.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\appshell.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\appstartup.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\auth.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\autocomplete.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\autoconfig.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\autoconfig.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\caps.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\chardet.xpt; DestDir: {app}\xulrunner\components @@ -166,7 +144,7 @@ Source: BUILD\ESC\xulrunner\components\commandhandler.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\commandlines.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\composer.xpt; DestDir: {app}\xulrunner\components -;Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\compreg.dat; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_html.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\content_htmldoc.xpt; DestDir: {app}\xulrunner\components @@ -200,14 +178,11 @@ Source: BUILD\ESC\xulrunner\components\find.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\gfx.xpt; DestDir: {app}\xulrunner\components ;Source: BUILD\ESC\xulrunner\components\gksvgrenderer.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\history.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\htmlparser.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\imgicon.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\imglib2.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\intl.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\intlcmpt.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jar.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\jsconsole.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jsconsole-clhandler.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\jsdservice.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\layout_base.xpt; DestDir: {app}\xulrunner\components @@ -223,7 +198,6 @@ Source: BUILD\ESC\xulrunner\components\necko_about.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_cache.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_cookie.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\necko_data.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_dns.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_file.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_ftp.xpt; DestDir: {app}\xulrunner\components @@ -232,13 +206,10 @@ Source: BUILD\ESC\xulrunner\components\necko_socket.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_strconv.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\necko_viewsource.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\nsCloseAllWindows.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsDefaultCLH.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsDictionary.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsExtensionManager.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsHelperAppDlg.js; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\nsInterfaceInfoToIDL.js; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\nsKillAll.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsPostUpdateWin.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsProgressDialog.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsProxyAutoConfig.js; DestDir: {app}\xulrunner\components @@ -247,47 +218,35 @@ Source: BUILD\ESC\xulrunner\components\nsXmlRpcClient.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\nsXULAppInstall.js; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\oji.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\passwordmgr.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\pipboot.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipboot.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\pipnss.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pipnss.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\pippki.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pippki.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\plugin.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\pref.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\prefetch.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\profile.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\progressDlg.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\proxyObject.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\rdf.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\satchel.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\shistory.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\toolkitprofile.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\transformiix.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\txmgr.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\txtsvc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\uconv.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\unicharutil.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\universalchardet.dll; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\update.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\uriloader.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webBrowser_core.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webbrowserpersist.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\webshell_idls.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\websrvcs.dll; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\websrvcs.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\widget.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\windowds.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\windowwatcher.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\xmlextras.dll; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\xmlextras.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xml-rpc.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_base.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_components.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_ds.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_io.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\xpcom_obsolete.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_thread.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpcom_xpti.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xpconnect.xpt; DestDir: {app}\xulrunner\components @@ -296,7 +255,6 @@ Source: BUILD\ESC\xulrunner\components\xulapp.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xulapp_setup.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xuldoc.xpt; DestDir: {app}\xulrunner\components -Source: BUILD\ESC\xulrunner\components\xulrunner.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\xultmpl.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\components\accessibility.xpt; DestDir: {app}\xulrunner\components Source: BUILD\ESC\xulrunner\defaults\autoconfig\prefcalls.js; DestDir: {app}\xulrunner\defaults\autoconfig @@ -304,8 +262,6 @@ Source: BUILD\ESC\xulrunner\defaults\pref\xulrunner.js; DestDir: {app}\xulrunner\defaults\pref Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome Source: BUILD\ESC\xulrunner\defaults\profile\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\chrome -Source: BUILD\ESC\xulrunner\defaults\profile\extensions\installed-extensions.txt; DestDir: {app}\xulrunner\defaults\profile\extensions -Source: BUILD\ESC\xulrunner\defaults\profile\extensions\Extensions.rdf; DestDir: {app}\xulrunner\defaults\profile\extensions Source: BUILD\ESC\xulrunner\defaults\profile\US\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile\US Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userContent-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome Source: BUILD\ESC\xulrunner\defaults\profile\US\chrome\userChrome-example.css; DestDir: {app}\xulrunner\defaults\profile\US\chrome @@ -322,36 +278,15 @@ Source: BUILD\ESC\xulrunner\res\entityTables\mathml20.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\entityTables\html40Latin1.properties; DestDir: {app}\xulrunner\res\entityTables Source: BUILD\ESC\xulrunner\res\fonts\mathfontSymbol.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\fontNameMap.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\fonts\mathfont.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMEX10.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontCMSY10.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath1.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath2.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontMath4.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontMTExtra.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\mathfontPUA.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\fonts\fontEncoding.properties; DestDir: {app}\xulrunner\res\fonts -Source: BUILD\ESC\xulrunner\res\html\gopher-unknown.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-binary.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-find.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-image.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-menu.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-movie.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-sound.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-telnet.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-text.gif; DestDir: {app}\xulrunner\res\html -Source: BUILD\ESC\xulrunner\res\html\gopher-audio.gif; DestDir: {app}\xulrunner\res\html ;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces-src.jar; DestDir: {app}\xulrunner\sdk\lib ;Source: BUILD\ESC\xulrunner\sdk\lib\MozillaInterfaces.jar; DestDir: {app}\xulrunner\sdk\lib Source: BUILD\ESC\defaults\preferences\esc-prefs.js; DestDir: {app}\defaults\preferences Source: BUILD\ESC\xulrunner\res\wincharset.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\arrowd.gif; DestDir: {app}\xulrunner\res -Source: BUILD\ESC\xulrunner\res\bloatcycle.html; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\broken-image.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\charsetalias.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\charsetData.properties; DestDir: {app}\xulrunner\res -Source: BUILD\ESC\xulrunner\res\cmessage.txt; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\EditorOverride.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\forms.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\grabber.gif; DestDir: {app}\xulrunner\res @@ -382,7 +317,6 @@ Source: BUILD\ESC\xulrunner\res\table-remove-row-active.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\table-remove-row-hover.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\ua.css; DestDir: {app}\xulrunner\res -Source: BUILD\ESC\xulrunner\res\viewer.properties; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\viewsource.css; DestDir: {app}\xulrunner\res Source: BUILD\ESC\xulrunner\res\arrow.gif; DestDir: {app}\xulrunner\res Source: BUILD\ESC\chrome\icons\default\esc-window.ico; DestDir: {app}\chrome\icons\default @@ -418,13 +352,93 @@ Source: BUILD\ESC\chrome\content\esc\MineOverlay.xul; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\password.js; DestDir: {app}\chrome\content\esc Source: BUILD\ESC\chrome\content\esc\certManager.xul; DestDir: {app}\chrome\content\esc +Source: BUILD\ESC\xulrunner\IA2Marshal.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\freebl3.chk; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\crashreporter.exe; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\crashreporter.ini; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\freebl3.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\javaxpcom.jar; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\javaxpcomglue.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\xpt_link.exe; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\nssdbm3.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\platform.ini; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\xpcshell.exe; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\xpidl.exe; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\xpt_dump.exe; DestDir: {app}\xulrunner +Source: BUILD\ESC\xulrunner\components\contentprefs.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\cookie.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\dom_json.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\dom_offline.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\dom_sidebar.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\dom_storage.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\dom_svg.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\exthelper.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\FeedProcessor.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\feeds.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\inspector.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\loginmgr.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsAddonRepository.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsBadCertHandler.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsBlocklistService.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsContentDispatchChooser.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsContentPrefService.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsDownloadManagerUI.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsHandlerService.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsLivemarkService.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsLoginInfo.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsLoginManager.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsLoginManagerPrompter.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsTaggingService.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsTryToClose.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsURLFormatter.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\nsWebHandlerApp.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\parentalcontrols.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\places.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\pluginGlue.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\saxparser.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\spellchecker.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\storage.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\storage-Legacy.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\txEXSLTRegExFunctions.js; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\urlformatter.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\xpcom_system.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\xpti.dat; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\components\zipwriter.xpt; DestDir: {app}\xulrunner\components +Source: BUILD\ESC\xulrunner\res\svg.css; DestDir: {app}\xulrunner\res +Source: BUILD\ESC\xulrunner\res\contenteditable.css; DestDir: {app}\xulrunner\res +Source: BUILD\ESC\xulrunner\res\designmode.css; DestDir: {app}\xulrunner\res +Source: BUILD\ESC\xulrunner\res\fonts\mathfontUnicode.properties; DestDir: {app}\xulrunner\res\fonts +Source: BUILD\ESC\xulrunner\res\fonts\mathfontStandardSymbolsL.properties; DestDir: {app}\xulrunner\res\fonts +Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXNonUnicode.properties; DestDir: {app}\xulrunner\res\fonts +Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir: {app}\xulrunner\res\fonts +Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html +Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile +Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11 +Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11 +Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11 +Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries +Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries +Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\debug.js; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\DownloadUtils.jsm; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\ISO8601DateUtils.jsm; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\JSON.jsm; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\Microformats.js; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\PluralForm.jsm; DestDir: {app}\modules +Source: BUILD\ESC\xulrunner\modules\utils.js; DestDir: {app}\modules [Run] Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir: {win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers.... Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v ""name='CoolKey Module' library=coolkeypk11.dll NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}"""""; WorkingDir: {sys}; StatusMsg: Configuring System for smart cards... -Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg} Flags: nowait +Filename: {app}\xulrunner\xulrunner.exe; Parameters: """--register-global""" +Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg}; Flags: nowait +[UninstallRun] +Filename: {app}\xulrunner\xulrunner.exe; Parameters: """--unregister-global""" [UninstallDelete] Type: filesandordirs; Name: {app} [_ISTool] @@ -433,12 +447,22 @@ LogFile=inst.log LogFileAppend=false [Registry] + ;The following lines register the CSP. Comment out if not available -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS#11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey + Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS#11 CSP +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00 -;End CSP registration + +; Now register the Gemalto 64K V2 +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags: uninsdeletekey + +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP + +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00 + + Root: HKLM; Subkey: Software\ ; Turn off the "pick a cert" dialog box Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3; ValueType: dword; ValueName: 1A04; ValueData: 0 @@ -484,6 +508,8 @@ Name: {app}\xulrunner\updates Name: {app}\xulrunner\updates\0 Name: {app}\defaults\preferences +Name: {app}\dictionaries +Name: {app}\modules; Flags: uninsalwaysuninstall [Code] Index: build.sh =================================================================== RCS file: /cvs/dirsec/esc/win32/build.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.sh 6 Mar 2008 00:10:14 -0000 1.5 +++ build.sh 4 Feb 2009 01:30:27 -0000 1.6 @@ -43,7 +43,7 @@ #Egate driver values -EGATE_DRIVER_URL=http://www.reflexreaders.com/Support/Downloads +EGATE_DRIVER_URL=http://www.it-secure.com/Downloads EGATE_DRIVER_NAME=e-gate_W2k_XP_24.zip #Zlib values @@ -110,6 +110,10 @@ cd $BASE_DIR + if [ -d $NSS_NAME ]; + then + echo "NSS already checked out." + else wget --no-check-certificate $NSS_SOURCE_URL if [ ! -f ./$NSS_ARCHIVE.tar.gz ]; @@ -125,6 +129,7 @@ echo "Can't untar NSS." return 1 fi + fi cd $NSS_NAME/mozilla/security/nss make BUILD_OPT=1 nss_build_all @@ -154,7 +159,7 @@ if [ -d coolkey ]; then - cvs -d $FEDORA_CVS_ROOT update -r $COOLKEY_TAG coolkey + echo "Echo CoolKey already checked out." else cvs -d $FEDORA_CVS_ROOT co -r $COOLKEY_TAG coolkey fi @@ -276,7 +281,7 @@ if [ -d esc ]; then - cvs -d $FEDORA_CVS_ROOT update esc + echo "ESC already checked out.." else cvs -d $FEDORA_CVS_ROOT co esc fi @@ -296,16 +301,6 @@ cd dist/src - if [ ! -d mozilla ]; - then - - echo "Obtaining XULRUNNER src..." - wget $XULRUNNER_SRC_URL - tar -xjvf $XULRUNNER_ARCHIVE_NAME - else - echo "Already have XULRUNNER src..." - - fi ZLIB_INC_PATH=${BASE_DIR}/zlib/include ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH` @@ -316,7 +311,7 @@ cd ../.. make BUILD_OPT=1 import - make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs ESC_VERSION=$ESC_VERSION_NO + make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs USE_XUL_SDK=1 ESC_VERSION=$ESC_VERSION_NO if [ $? != 0 ]; then From jmagne at fedoraproject.org Wed Feb 4 01:43:48 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:48 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src Makefile,1.4,1.5 Message-ID: <20090204014348.B7EB270142@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947 Modified Files: Makefile Log Message: Latest RHEL fixes. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 25 Jul 2007 20:16:01 -0000 1.4 +++ Makefile 4 Feb 2009 01:43:46 -0000 1.5 @@ -23,7 +23,7 @@ ifeq ($(OS_ARCH), WINNT) -DIRS += xulrunner app/eginstall app/xpcom/tray app/xpcom +DIRS += app/eginstall app/xpcom/tray app/xpcom endif ifeq ($(OS_ARCH), Darwin) From jmagne at fedoraproject.org Wed Feb 4 01:43:49 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:49 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.6, 1.7 Message-ID: <20090204014349.2EAC270142@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/app/xul/esc Modified Files: application.ini Log Message: Latest RHEL fixes. Index: application.ini =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- application.ini 7 May 2007 23:48:07 -0000 1.6 +++ application.ini 4 Feb 2009 01:43:46 -0000 1.7 @@ -25,7 +25,7 @@ Name=ESC ; ; This field specifies your application's version. This field is optional. -Version=1.0.1 +Version=1.1.0-1 ; ; This field specifies your application's build ID (timestamp). This field is ; required. @@ -41,12 +41,12 @@ ; 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.8 +MinVersion=1.9 ; ; 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=1.9 +MaxVersion=1.99 [Shell] From jmagne at fedoraproject.org Wed Feb 4 01:43:49 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:49 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient httpClientNss.cpp, 1.2, 1.3 manifest.mn, 1.3, 1.4 Message-ID: <20090204014349.7F01570130@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/NssHttpClient In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/lib/NssHttpClient Modified Files: httpClientNss.cpp manifest.mn Log Message: Latest RHEL fixes. Index: httpClientNss.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/httpClientNss.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- httpClientNss.cpp 27 Sep 2006 17:49:21 -0000 1.2 +++ httpClientNss.cpp 4 Feb 2009 01:43:47 -0000 1.3 @@ -50,6 +50,11 @@ { delete _response; } + + if(_engine) + { + delete _engine; + } } /* @@ -90,10 +95,14 @@ { request.setChunkedEntityData((int)strlen(body),body); } - HttpEngine engine; - _engine = &engine; - PSHttpResponse *resp = engine.makeRequest( request, server, timeout /*_timeout*/ , PR_FALSE /* expect chunked*/,PR_TRUE /* process streamed */); + _engine = new HttpEngine(); + + if(!_engine) + return NULL; + + + PSHttpResponse *resp = _engine->makeRequest( request, server, timeout /*_timeout*/ , PR_FALSE /* expect chunked*/,PR_TRUE /* process streamed */); _response = resp; Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- manifest.mn 10 Jan 2007 02:20:51 -0000 1.3 +++ manifest.mn 4 Feb 2009 01:43:47 -0000 1.4 @@ -31,7 +31,7 @@ MAPFILE = $(OBJDIR)/httpchunked.def -DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr +DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -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 CPPSRCS = \ Cache.cpp \ From jmagne at fedoraproject.org Wed Feb 4 01:43:49 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:49 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray Makefile.sdk, NONE, 1.1 Makefile, 1.3, 1.4 rhLinuxTray.cpp, 1.6, 1.7 rhTray.h, 1.5, 1.6 Message-ID: <20090204014349.104A970144@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom/tray In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/app/xpcom/tray Modified Files: Makefile rhLinuxTray.cpp rhTray.h Added Files: Makefile.sdk Log Message: Latest RHEL fixes. --- NEW FILE Makefile.sdk --- # # 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 ***** CORE_DEPTH = ../../../.. 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) endif # Change this to point at your Gecko SDK directory. ifndef GECKO_SDK_PATH GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk endif GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include ifndef GECKO_INCLUDE_PATH GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre endif ifndef GECKO_BIN_PATH GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre endif ifeq ($(OS_ARCH),Darwin) ifndef GECKO_SDK_PATH GECKO_SDK_PATH =/Users/jmagne/Desktop/gecko-sdk-mac-universal endif GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin ifndef XUL_FRAMEWORK_PATH XUL_FRAMEWORK_PATH=/Library/Frameworks/XUL.framework endif XUL_FRAMEWORK_BIN_PATH=$(XUL_FRAMEWORK_PATH)/Versions/Current endif ifeq ($(OS_ARCH),WINNT) ifndef GECKO_SDK_PATH GECKO_SDK_PATH =c:/xulrunner-sdk/xulrunner-sdk endif GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/sdk/include GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin XUL_FRAMEWORK_BIN_PATH=$(GECKO_BIN_PATH) endif #DEPLOY_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build #Xulrunner constants XULRUNNER_BIN_PATH = $(GECKO_BIN_PATH) XULRUNNER_EXEC = xulrunner ifeq ($(OS_ARCH), Darwin) XULRUNNER_BIN_PATH = $(GECKO_BIN_PATH) XULRUNNER_EXEC = xulrunner-bin XULRUNNER_FRAME_DEST = ESC.app/Contents/Frameworks/XUL.framework XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks ifndef XUL_FRAMEWORK_PATH XUL_FRAMEWORK_PATH=/Library/Frameworks/XUL.framework endif XUL_FRAMEWORK_BIN_PATH=$(XUL_FRAMEWORK_PATH)/Versions/Current endif DEPLOY_OFFSET=/src DESTDIR= ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src #DESTDIR=$(MOZ_OBJDIR)/install endif INSTALL_STUFF = ifeq ($(OS_ARCH),Linux) INSTALL_STUFF += icon.png endif ifeq ($(OS_ARCH),WINNT) INSTALL_STUFF += esc.ico esc.bmp endif CXX = c++ CPPFLAGS += -fno-rtti \ -fno-exceptions \ -fshort-wchar -DXPCOM_GLUE_USE_NSPR=1 ifeq ($(OS_ARCH),WINNT) CPPFLAGS = -MD -DXP_WIN=1 -DXP_WIN32=1 -DXPCOM_GLUE -DXPCOM_GLUE_USE_NSPR -TP -nologo -W3 -Gy -EHsc -DNDEBUG CXX = cl LINK = link RC = rc.exe endif ifeq ($(OS_ARCH),Darwin) ifdef PPC_BUILD CXX = c++-3.3 CPPFLAGS += -arch ppc else CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 endif endif ifeq ($(OS_ARCH),WINNT) OS_LIBS+=shell32.lib kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib XPCOM_GLUE_LDOPTS += /Force MOZ_NO_DEBUG_RTL=1 RCFILE =cool.rc RESFILE =cool.res RCFLAGS =-r -Fo endif NOTIFY_DEPTH = $(CORE_DEPTH)/src/lib/notifytray NOTIFY_CXX_FLAGS = -I$(NOTIFY_DEPTH) $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --cflags gtk+-2.0) NOTIFY_LDFLAGS = $(shell pkg-config --libs libnotify) COOLKEY_LIBS+= -L $(CORE_DIST)/lib -ltraynotify -L/usr/lib $(NOTIFY_LDFLAGS) ifeq ($(OS_ARCH),Darwin) GECKO_LD_LIBS=-W1,dead_strip $(GECKO_SDK_PATH)/lib/libxpcomglue.a -Wl,-executable_path,$(GECKO_SDK_PATH)/lib -lxpcom -L$(XUL_FRAMEWORK_BIN_PATH) -lssl3 -lnssutil3 -lsqlite3 -lnss3 -lsoftokn3 -lsmime3 endif ifeq ($(OS_ARCH),WINNT) GECKO_LD_LIBS= -IMPLIB:fake-import /LIBPATH:$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/xpcomglue.lib xpcomglue_s.lib $(OS_LIBS) $(RESFILE) $(XPCOM_GLUE_LDOPTS) 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 # #include "mozilla-config.h" to each of your .cpp files. #GECKO_CONFIG_INCLUDE = -include mozilla-config.h GECKO_DEFINES = -DMOZILLA_CLIENT -DXPCOM_GLUE NSS_INCLUDE = /usr/include/nss3 NSPR_INCLUDE = /usr/include/nspr4 GECKO_INCLUDES = -I $(GECKO_SDK_PATH)/include -I $(GECKO_SDK_INCLUDE_PATH) -I $(GECKO_INCLUDE_PATH) -I$(GECKO_INCLUDE_PATH)/gfx -I $(NSPR_INCLUDE) -I $(NSS_INCLUDE) -I $(GECKO_INCLUDE_PATH)/xpcom COOL_INCLUDES = -I $(CORE_INC)/ckymanager -I $(CORE_INC)/httpchuncked COOL_LDFLAGS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked $(CKY_LIB_LDD) ifeq ($(OS_ARCH),Darwin) CPPFLAGS += -F/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon -DXP_MACOSX -DXPCOM_GLUE_USE_NSPR COOL_LDFLAGS += -lsystemStubs -framework Carbon -bundle -lm GECKO_DEFINES = -DMOZILLA_CLIENT -DXPCOM_GLUE_USE_NSPR endif ifeq ($(OS_ARCH),WINNT) FILES = \ rhTray.cpp \ $(NULL) OBJECT = rhTray.obj endif ifeq ($(OS_ARCH),Linux) FILES = \ rhLinuxTray.cpp \ $(NULL) OBJECT = rhLinuxTray.o endif ifeq ($(OS_ARCH),Darwin) FILES = \ rhMacTray.cpp \ $(NULL) OBJECT = rhMacTray.o endif GECKO_LDFLAGS= -lnspr4 \ -lplds4 -lplc4 -ldl -lpthread \ $(GECKO_LD_LIBS) TARGET = librhTray.so ifeq ($(OS_ARCH),Darwin) TARGET = librhTray.dylib endif ifeq ($(OS_ARCH),WINNT) GECKO_LDFLAGS = nspr4.lib $(GECKO_LD_LIBS) TARGET = rhTray.dll endif 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 $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhITrayWindNotify.idl $(GECKO_BIN_PATH)/xpidl -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhITrayWindNotify.idl ifeq ($(OS_ARCH),Darwin) $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOL_LDFLAGS) endif ifeq ($(OS_ARCH),Linux) $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(CXXFLAGS) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -shared -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOLKEY_LIBS) chmod +x $(TARGET) strip $(TARGET) endif ifeq ($(OS_ARCH),WINNT) $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(CXXFLAGS) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(RC) $(RCFLAGS)$(RESFILE) $(RCFILE) $(LINK) -NOLOGO -DLL -OUT:$(TARGET) $(OBJECT) -SUBSYSTEM:WINDOWS $(GECKO_DEFINES) $(GECKO_LDFLAGS) endif chmod +x $(TARGET) export:: echo "Export" clean:: echo "Cleaning up." rm -f *.xpt rm -f *.so rm -f *.o rm -f *.obj rm -f *.dll ifeq ($(OS_ARCH),Darwin) rm -rf i386 rm -rf ppc rm -rf *.dylib endif deploy: $(DEPLOY_OBJDIR) echo "Deploying" echo $(IMPORT_LIBRARY) $(NSINSTALL) ./$(LIB_PREFIX)rhTray.$(DLL_SUFFIX) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components $(NSINSTALL) ./*.xpt $(INSTALL_STUFF) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 10 Jan 2007 02:19:36 -0000 1.3 +++ Makefile 4 Feb 2009 01:43:46 -0000 1.4 @@ -23,6 +23,12 @@ DARWIN_LIB_NAME=librhTray.dylib +MAKEFILE=Makefile.moz + +ifdef USE_XUL_SDK +MAKEFILE=Makefile.sdk +endif + CORE_INC=$(SOURCE_XP_DIR)/public MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla @@ -41,7 +47,7 @@ all export install clean deploy args:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR) $@" echo $(DIST) - $(MAKE) -f Makefile.moz $@ \ + $(MAKE) -f $(MAKEFILE) $@ \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ @@ -50,17 +56,17 @@ ifeq ($(OS_ARCH),Darwin) echo "Darwin all" - $(MAKE) -f Makefile.moz $@ \ + $(MAKE) -f $(MAKEFILE) $@ \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) endif libs:: - $(MAKE) -f Makefile.moz libs \ + $(MAKE) -f $(MAKEFILE) libs \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ @@ -72,22 +78,22 @@ mkdir -p $(UNIVERSAL_OFFSET_386) mkdir -p $(UNIVERSAL_OFFSET_PPC) mv -n $(DARWIN_LIB_NAME) i386 - rm Makefile.in + rm -f Makefile.in rm *.o - $(MAKE) -f Makefile.moz libs \ + $(MAKE) -f $(MAKEFILE) libs \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) \ + PPC_BUILD=1 mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) - endif ifeq ($(OS_ARCH),Darwin) echo "Darwin Creating UNI binary." lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) endif - $(MAKE) -f Makefile.moz deploy \ + $(MAKE) -f $(MAKEFILE) deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ Index: rhLinuxTray.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rhLinuxTray.cpp 18 Jan 2008 17:53:57 -0000 1.6 +++ rhLinuxTray.cpp 4 Feb 2009 01:43:46 -0000 1.7 @@ -400,7 +400,7 @@ if(!strcmp((char *)data,"icon.exit")) { - gtk_main_quit(); + exit(0); } } Index: rhTray.h =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rhTray.h 7 May 2007 23:46:43 -0000 1.5 +++ rhTray.h 4 Feb 2009 01:43:46 -0000 1.6 @@ -58,7 +58,7 @@ #ifdef XP_WIN32 - +#define NS_REINTERPRET_CAST(__type, __expr) reinterpret_cast< __type >(__expr) #define _WIN32_IE 0x0500 #include #include From jmagne at fedoraproject.org Wed Feb 4 01:43:48 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:48 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile.sdk, NONE, 1.1 Makefile, 1.3, 1.4 openkey.h, 1.2, 1.3 rhCoolKey.cpp, 1.9, 1.10 Message-ID: <20090204014348.E98FA70143@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/app/xpcom Modified Files: Makefile openkey.h rhCoolKey.cpp Added Files: Makefile.sdk Log Message: Latest RHEL fixes. --- NEW FILE Makefile.sdk --- # # 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 ***** CORE_DEPTH = ../../.. DEPLOY_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build include $(CORE_DEPTH)/coreconf/config.mk include $(CORE_DEPTH)/coreconf/rules.mk # Change this to point at your Gecko SDK directory. ifndef GECKO_SDK_PATH GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk endif ifndef GECKO_INCLUDE_PATH GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre endif ifndef GECKO_BIN_PATH GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre endif XUL_FRAMEWORK_BIN_PATH=$(GECKO_BIN_PATH) ifeq ($(OS_ARCH),Darwin) ifndef GECKO_SDK_PATH GECKO_SDK_PATH =/Users/jmagne/Desktop/gecko-sdk-mac-universal endif GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin ifndef XUL_FRAMEWORK_PATH XUL_FRAMEWORK_PATH=/Library/Frameworks/XUL.framework endif XUL_FRAMEWORK_BIN_PATH=$(XUL_FRAMEWORK_PATH)/Versions/Current endif ifeq ($(OS_ARCH),WINNT) ifndef GECKO_SDK_PATH GECKO_SDK_PATH =c:/xulrunner-sdk/xulrunner-sdk endif GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/sdk/include GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin XUL_FRAMEWORK_BIN_PATH=$(GECKO_BIN_PATH) endif DEPLOY_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build #Xulrunner constants XULRUNNER_BIN_PATH = $(GECKO_BIN_PATH) XULRUNNER_EXEC = xulrunner ifeq ($(OS_ARCH), Darwin) XULRUNNER_BIN_PATH = $(XUL_FRAMEWORK_BIN_PATH) XULRUNNER_EXEC = xulrunner-bin XULRUNNER_FRAME_DEST = ESC.app/Contents/Frameworks/XUL.framework XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks endif DEPLOY_OFFSET=/src DESTDIR= ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src #DESTDIR=$(MOZ_OBJDIR)/install endif ifeq ($(OS_ARCH),WINNT) CXX = cl LINK = link endif ifeq ($(OS_ARCH),Darwin) ifdef PPC_BUILD CXX = c++-3.3 CPPFLAGS += -arch ppc else CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 endif endif ifeq ($(OS_ARCH),Darwin) GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib -W1, $(GECKO_SDK_PATH)/lib/libxpcomglue.a -L$(XUL_FRAMEWORK_BIN_PATH) -lnss3 -lssl3 -lsoftokn3 -lplds4 -lplc4 -lnssutil3 endif ifeq ($(OS_ARCH),Linux) CPPFLAGS += -fno-rtti \ -fno-exceptions \ -fshort-wchar -fPIC GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl endif ifeq ($(OS_ARCH),WINNT) CPPFLAGS = -MD -DXP_WIN=1 -DXP_WIN32=1 -DXPCOM_GLUE -TP -nologo -W3 -Gy -EHsc -DNDEBUG GECKO_LD_LIBS=/LIBPATH:$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/xpcomglue.lib #$(GECKO_SDK_PATH)/lib/xul.lib 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 # #include "mozilla-config.h" to each of your .cpp files. #GECKO_CONFIG_INCLUDE = -include mozilla-config.h GECKO_DEFINES = -DXPCOM_GLUE -DMOZILLA_CLIENT NSS_INCLUDE = /usr/include/nss3 NSPR_INCLUDE = /usr/include/nspr4 GECKO_INCLUDES = -I $(GECKO_SDK_PATH)/include -I $(GECKO_INCLUDE_PATH) -I $(NSPR_INCLUDE) -I $(NSS_INCLUDE) -I $(GECKO_INCLUDE_PATH)/xpcom COOL_INCLUDES = -I $(CORE_INC)/ckymanager -I $(CORE_INC)/httpchuncked COOL_LDFLAGS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked $(CKY_LIB_LDD) -lckyapplet OBJECT = rhCoolKey.o ifeq ($(OS_ARCH), WINNT) GECKO_INCLUDES += -I $(GECKO_SDK_PATH)/sdk/include OBJECT = rhCoolKey.obj OBJECTCSP = CoolKeyCSP.obj COOL_LDFLAGS = -IMPLIB:fake-import /LIBPATH:$(CORE_DIST)/lib ckymanager.lib httpchunked.lib $(GECKO_LD_LIBS) nss3.lib ssl3.lib smime3.lib softokn3.lib /LIBPATH:$(CKY_LIB_LDD) libckyapplet.lib crypt32.lib kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib /NODEFAULTLIB:libc.lib endif ifeq ($(OS_ARCH),Darwin) COOL_LDFLAGS += -lsystemStubs -framework Carbon -bundle -lm endif GECKO_LDFLAGS= -lnspr4 \ -lplds4 -lplc4 -ldl -lpthread -Wl -z \ $(GECKO_LD_LIBS) ifeq ($(OS_ARCH),WINNT) GECKO_LDFLAGS= nspr4.lib plds4.lib plc4.lib $(GECKO_LD_LIBS) endif FILES = rhCoolKey.cpp FILESCSP = CoolKeyCSP.cpp ifeq ($(OS_ARCH),Linux) TARGET = librhCoolKey.so endif ifeq ($(OS_ARCH),Darwin) TARGET = librhCoolKey.dylib endif ifeq ($(OS_ARCH),WINNT) TARGET = rhCoolKey.dll endif install:: ifdef DESTDIR cp -rf $(DEPLOY_OBJDIR)/esc/* $(DESTDIR) cp -f $(CORE_DIST)/bin/escd $(DESTDIR) 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 $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m header rhICoolKey.idl $(GECKO_BIN_PATH)/xpidl -v -I $(GECKO_SDK_PATH)/idl -I $(NSPR_INCLUDE) -m typelib rhICoolKey.idl ifeq ($(OS_ARCH),Darwin) $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOL_LDFLAGS) chmod +x $(TARGET) endif ifeq ($(OS_ARCH),Linux) $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -shared -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOL_LDFLAGS) chmod +x $(TARGET) strip $(TARGET) endif ifeq ($(OS_ARCH),WINNT) $(CXX) $(CPPFLAGS) -Fo$(OBJECT) -c $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -Fo$(OBJECTCSP) -c $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILESCSP) $(LINK) -NOLOGO -DLL -OUT:$(TARGET) $(OBJECT) $(OBJECTCSP) $(GECKO_LDFLAGS) $(GECKO_DEFINES) $(COOL_LDFLAGS) endif export:: touch Makefile.in echo "Export" clean:: echo "Cleaning up." rm -f $(TARGET) rm -f *.xpt rm -f *.so rm -f *.o rm -f *.dylib rm -f *.obj rm -rf $(DEPLOY_OBJDIR) rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc ifeq ($(OS_ARCH),Darwin) rm -rf ppc rm -rf i386 endif deploy: $(DEPLOY_OBJDIR) echo "Deploy." $(DEPLOY_OBJDIR): echo "Installing!" $(NSINSTALL) ./$(LIB_PREFIX)rhCoolKey.$(DLL_SUFFIX) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components $(NSINSTALL) ./*.xpt $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components echo "Creating $(DEPLOY_OBJDIR)" mkdir $(DEPLOY_OBJDIR) cd $(CORE_DEPTH)/$(DEPLOY_OFFSET)/app/xul/esc; zip -r test.zip * -x *\CVS\* \*.fix*; unzip -d esc test.zip ; rm -f test.zip $(XUL_FRAMEWORK_BIN_PATH)/$(XULRUNNER_EXEC) --install-app $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc $(DEPLOY_OBJDIR) ifeq ($(OS_ARCH), Darwin) mkdir $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_BASE) cp -Rf -v $(XUL_FRAMEWORK_PATH) $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST) endif ifeq ($(OS_ARCH),Linux) endif ifeq ($(OS_ARCH),WINNT) mkdir -p $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc/xulrunner cp -rf $(XUL_FRAMEWORK_BIN_PATH)/* $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc/xulrunner endif ifdef DESTDIR $(NSINSTALL) $(DEPLOY_OBJDIR) $(DESTDIR) endif Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 10 Jan 2007 02:20:13 -0000 1.3 +++ Makefile 4 Feb 2009 01:43:46 -0000 1.4 @@ -19,12 +19,20 @@ CORE_DEPTH = ../../.. +MAKEFILE=Makefile.moz + + +ifdef USE_XUL_SDK +MAKEFILE=Makefile.sdk +endif + include $(CORE_DEPTH)/coreconf/config.mk include $(CORE_DEPTH)/coreconf/rules.mk CORE_INC=$(SOURCE_XP_DIR)/public -MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla -MOZ_OBJDIR=$(DIST)/xulrunner_build +MOZ_SRCDIR=/home/jmagne/xulrunner/mozilla +#MOZ_OBJDIR=$(DIST)/xulrunner_build +MOZ_OBJDIR=$(MOZ_SRC_DIR) DARWIN_LIB_NAME=librhCoolKey.dylib @@ -44,7 +52,7 @@ all export install clean deploy args:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)" - $(MAKE) -f Makefile.moz $@ \ + $(MAKE) -f $(MAKEFILE) $@ \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ @@ -53,7 +61,7 @@ ifeq ($(OS_ARCH),Darwin) echo "Darwin all" - $(MAKE) -f Makefile.moz $@ \ + $(MAKE) -f $(MAKEFILE) $@ \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ @@ -64,7 +72,7 @@ libs:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)" - $(MAKE) -f Makefile.moz libs \ + $(MAKE) -f $(MAKEFILE) libs \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ @@ -78,12 +86,13 @@ mv -n $(DARWIN_LIB_NAME) i386 rm Makefile.in rm *.o - $(MAKE) -f Makefile.moz libs \ + $(MAKE) -f $(MAKEFILE) libs \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) \ + PPC_BUILD=1 mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) endif @@ -92,7 +101,7 @@ echo "Darwin Creating UNI binary." lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) endif - $(MAKE) -f Makefile.moz deploy \ + $(MAKE) -f $(MAKEFILE) deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ Index: openkey.h =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/openkey.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openkey.h 25 Oct 2006 03:58:16 -0000 1.2 +++ openkey.h 4 Feb 2009 01:43:46 -0000 1.3 @@ -21,8 +21,11 @@ #define OPENKEY_CARD_NAME "CoolKey Card Type" #define OPENKEY_CARD_NAME_MS "CoolKey Card Type\0" /* a multi-string */ -#define OPENKEY_PROV "Identity Alliance CSP" -#define OPENKEY_PROV_W L"Identity Alliance CSP" +//#define OPENKEY_PROV "Identity Alliance CSP" +//#define OPENKEY_PROV_W L"Identity Alliance CSP" + +#define OPENKEY_PROV "CoolKey PKCS #11 CSP" +#define OPENKEY_PROV_W L"CoolKey PKCS #11 CSP" #define OPENKEY_NAME_W L"CoolKey" Index: rhCoolKey.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rhCoolKey.cpp 18 Jan 2008 17:52:52 -0000 1.9 +++ rhCoolKey.cpp 4 Feb 2009 01:43:46 -0000 1.10 @@ -39,6 +39,7 @@ #include "nsIObserverService.h" #include "nsXPCOMGlue.h" #include "prlink.h" +#include "prthread.h" #include "nscore.h" #include "content/nsCopySupport.h" #include @@ -74,7 +75,9 @@ static const nsIID kISupportsIID = NS_ISUPPORTS_IID; static const nsIID kIComponentRegistrarIID = NS_ICOMPONENTREGISTRAR_IID; -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); +//static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); + +#define NS_XPCOMPROXY_CONTRACTID "@mozilla.org/xpcomproxy;1" static const nsCID kCoolKeyCID = COOLKEY_CID; @@ -313,20 +316,22 @@ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::InitInstance %p \n",GetTStamp(tBuff,56),this)); - char *path = (char *) GRE_GetXPCOMPath(); + char xpcom_path[4096]; + xpcom_path[0] = 0; - PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GREPath %s \n",GetTStamp(tBuff,56),path)); + static const GREVersionRange greVersion = + { + "1.9", PR_TRUE, + "2", PR_TRUE + }; - char xpcom_path[512]; + nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcom_path, 4096); + if (NS_FAILED(rv)) { + return PR_FALSE; + } - char *lib_name = XPCOM_LIB_NAME ; + char *lib_name =(char *) XPCOM_LIB_NAME ; -#ifdef XP_WIN32 - - sprintf(xpcom_path,"%s",path); -#else - sprintf(xpcom_path,"%s/%s",path,lib_name); -#endif PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::xpcom_path %s \n",GetTStamp(tBuff,56),xpcom_path)); @@ -419,7 +424,7 @@ PR_ASSERT(manager); - manager->GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(rhICoolKey), this, PROXY_SYNC | PROXY_ALWAYS, (void**)&proxyObject); + manager->GetProxyForObject(NULL, NS_GET_IID(rhICoolKey), this, NS_PROXY_SYNC | NS_PROXY_ALWAYS, (void**)&proxyObject); PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::CreateProxyObject: original: %p proxy %p \n",GetTStamp(tBuff,56),this,proxyObject)); @@ -1444,7 +1449,7 @@ char tBuff[56]; PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyVersion \n",GetTStamp(tBuff,56))); - char *version = GETSTRING(ESC_VERSION); + char *version = (char *) GETSTRING(ESC_VERSION); char *versionVal = (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) + 1); From jmagne at fedoraproject.org Wed Feb 4 01:43:49 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:49 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKeyHandler.cpp, 1.4, 1.5 manifest.mn, 1.3, 1.4 Message-ID: <20090204014349.A74B070142@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/lib/coolkey Modified Files: CoolKeyHandler.cpp manifest.mn Log Message: Latest RHEL fixes. Index: CoolKeyHandler.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKeyHandler.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CoolKeyHandler.cpp 7 Jun 2007 21:21:17 -0000 1.4 +++ CoolKeyHandler.cpp 4 Feb 2009 01:43:47 -0000 1.5 @@ -48,7 +48,9 @@ //static char *test_extended_login = "s=325&msg_type=13&invalid_login=0&blocked=0&error=&required_parameter0=id%3DUSER%5FID%26name%3DUser+ID%26desc%3DUser+ID%26type%3Dstring%26option%3Doption1%2Coption2%2Coption3&required_parameter1=id%3DUSER%5FPWD%26name%3DUser+Password%26desc%3DUser+Password%26type%3Dpassword%26option%3D&required_parameter2=id%3DUSER%5FPIN%26name%3DPIN%26desc%3DOne+time+PIN+received+via+mail%26type%3Dpassword%26option%3D"; #include - +#ifndef CKO_NETSCAPE +#define CKO_NETSCAPE CKO_NSS +#endif #ifndef CKO_MOZILLA_READER #define CKO_MOZILLA_READER (CKO_NETSCAPE+5) #define CKA_MOZILLA_IS_COOL_KEY (CKO_NETSCAPE+24) @@ -2162,11 +2164,6 @@ info->mReaderName[label.len] = 0; info->mInfoFlags = MapGetFlags(&tokenInfo); - //Handle the isCOOLKey flag - if(isACOOLKey) { - info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK; - } - info->mCUID = (char *)malloc(35); /* should be a define ! */ if (!info->mCUID) { goto failed; @@ -2177,6 +2174,22 @@ goto failed; } + PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: tokenInfo.label length %d.\n",GetTStamp(tBuff,56),strlen((char *) tokenInfo.label))); + + // Give the CAC card some sort of unique key ID + + if(strlen(info->mCUID) == 0) + { + strncpy(info->mCUID,(char *)tokenInfo.label,35); + info->mCUID[34] = 0; + isACOOLKey = 0; + } + + //Handle the isCOOLKey flag + if(isACOOLKey) { + info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK; + } + SECITEM_FreeItem(&ATR,PR_FALSE); SECITEM_FreeItem(&label,PR_FALSE); SECITEM_FreeItem(&isCOOLKey,PR_FALSE); Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- manifest.mn 10 Jan 2007 02:21:25 -0000 1.3 +++ manifest.mn 4 Feb 2009 01:43:47 -0000 1.4 @@ -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 +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 MAPFILE = $(OBJDIR)/ckymanager.def #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet From jmagne at fedoraproject.org Wed Feb 4 01:43:49 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 4 Feb 2009 01:43:49 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.17, 1.18 MineOverlay.xul, 1.1, 1.2 certManager.xul, 1.1, 1.2 password.js, 1.3, 1.4 password.xul, 1.3, 1.4 Message-ID: <20090204014349.756D470142@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17947/app/xul/esc/chrome/content/esc Modified Files: ESC.js MineOverlay.xul certManager.xul password.js password.xul Log Message: Latest RHEL fixes. Index: ESC.js =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ESC.js 28 May 2008 03:00:33 -0000 1.17 +++ ESC.js 4 Feb 2009 01:43:47 -0000 1.18 @@ -51,8 +51,6 @@ const ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode"; const ESC_SECURITY_URL="esc.security.url"; const ESC_SECURE_URL="esc.secure.url"; -const ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url"; -const SPECIAL_ATR="3B76940000FF6276010000"; const CLEAN_TOKEN = "cleanToken"; const UNINITIALIZED = 1; @@ -292,10 +290,6 @@ //Check for special key since we have no phone home info. - if(!home) { - home = GetGlobalPhoneHomeUrl(keyType,keyID); - } - var homeRes = false; if(home) @@ -317,43 +311,6 @@ return homeRes; } -//Get global phone home url only for a special key - -function GetGlobalPhoneHomeUrl(keyType,keyID) -{ - - var globalIssuerURL=null; - var specialATR=SPECIAL_ATR; - var phonHomeURL= DoCoolKeyGetATR(keyType,keyID); - - var specialAppletVerMaj=1; - var specialAppletVerMin=1; - - - var appletVerMaj = DoGetCoolKeyGetAppletVer(keyType, keyID , true); - var appletVerMin = DoGetCoolKeyGetAppletVer(keyType, keyID, false); - - - if( (appletVerMaj != specialAppletVerMaj) || - ( appletVerMin > specialAppletVerMin)) { - - return null; - } - - var keyATR = DoCoolKeyGetATR(keyType,keyID); - - - if( keyATR != specialATR) { - return null; - } - - globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL); - - - return globalIssuerURL; - -} - //Test Phone Home url in config UI function DoPhoneHomeTest() @@ -724,7 +681,6 @@ issuer = GetCachedIssuer(keyID); - // Now try to read off the certs if applicable if(!issuer && (GetStatusForKeyID(keyType, keyID) == getBundleString("statusEnrolled"))) @@ -733,6 +689,22 @@ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); issuer = netkey.GetCoolKeyIssuer(keyType,keyID); + var issuer_url = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL); + var issuer_url_value = null; + + if(issuer_url) + { + issuer_url_value = DoCoolKeyGetConfigValue(issuer_url); + } + + if(issuer && !issuer_url_value) + { + var issuer_config_value = ConfigValueWithKeyID(keyID,KEY_ISSUER); + if(issuer_config_value) + { + DoCoolKeySetConfigValue(issuer_config_value,issuer); + } + } } catch (e) { issuer = null; Index: MineOverlay.xul =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/MineOverlay.xul,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MineOverlay.xul 27 Sep 2006 17:52:54 -0000 1.1 +++ MineOverlay.xul 4 Feb 2009 01:43:47 -0000 1.2 @@ -19,11 +19,9 @@ - Portions created by the Initial Developer are Copyright (C) 2001 - the Initial Developer. All Rights Reserved. - - - Portions created by Jack Magne are Copyright (C) 2006 Red Hat, Inc. - Contributor(s): - Bob Lord - Ian McGreer - - Jack Magne - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or @@ -60,9 +58,13 @@ + @@ -80,20 +82,28 @@