[Fedora-directory-commits] esc/win32 build.sh,1.8,1.9
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22979
Modified Files:
build.sh
Log Message:
Get pk11install working. Bug #497930.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.sh 30 Mar 2009 22:03:00 -0000 1.8
+++ build.sh 29 Apr 2009 20:37:59 -0000 1.9
@@ -37,6 +37,8 @@
NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4
NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/relea...
+NSS_LIB_PATH=$NSS_NAME/mozilla/dist/WIN*/lib
+
#Inno installer values
#INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe"
@@ -462,6 +464,15 @@
cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
+
+ #Transport the nss files needed for pk11install.exe
+
+ cp $NSS_LIB_PATH/softokn3.dll BUILD
+ cp $NSS_LIB_PATH/libplc4.dll BUILD
+ cp $NSS_LIB_PATH/libnspr4.dll BUILD
+ cp $NSS_LIB_PATH/libplds4.dll BUILD
+
+
# Build the INNO executable installer
"$INNO_PATH" setup.iss
14 years, 10 months
[Fedora-directory-commits] esc/win32 setup.iss,1.9,1.10
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22544
Modified Files:
setup.iss
Log Message:
Get pk11install working. Bug# 497930.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setup.iss 15 Apr 2009 21:47:32 -0000 1.9
+++ setup.iss 29 Apr 2009 20:36:09 -0000 1.10
@@ -111,19 +111,18 @@
Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11
+Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
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
@@ -414,9 +413,6 @@
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
14 years, 10 months
[Fedora-directory-commits] esc/src/lib/coolkey manifest.mn,1.4,1.5
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16978
Modified Files:
manifest.mn
Log Message:
Add minor compile flag.
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- manifest.mn 4 Feb 2009 01:43:47 -0000 1.4
+++ manifest.mn 23 Apr 2009 22:04:11 -0000 1.5
@@ -27,7 +27,7 @@
ifndef MOZ_OFFSET
MOZ_OFFSET = mozilla-1.7.13
endif
-DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss
+DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing
MAPFILE = $(OBJDIR)/ckymanager.def
#EXTRA_LIBS += -L$(DIST)/lib -lckyapplet
14 years, 11 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US esc.properties, 1.7, 1.8
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13799
Modified Files:
esc.properties
Log Message:
Fix for #494981, better error message when use can't re-enroll token.
Index: esc.properties
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- esc.properties 7 Jun 2007 21:19:51 -0000 1.7
+++ esc.properties 22 Apr 2009 23:38:20 -0000 1.8
@@ -104,7 +104,8 @@
errorInvalidTokenTypeParams=The Smart Card Server cannot process the requested type of enrollment due to a misconfiguration.
errorCannotPublish=The Smart Card Server cannot publish your card's certificates to the certificate directory.
errorCommTokenDB=The Smart Card Server cannot connect to its internal database.
-errorTokenSuspended=Your smart card has been suspended.
+errorTokenSuspended=You are not allowed to perform this operation with this sm
+art card.
errorPinResetable=You are not allowed to reset the password of this smart card.
errorConnLost=The Smart Card Manager has lost the connection to the Smart Card Server.
errorEntryTokenDB=The Smart Card Server cannot add your smart card to its internal database.
14 years, 11 months
[Fedora-directory-commits] ldapserver/ldap/servers/snmp main.c, 1.16, 1.17
by Nathan Kinder
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/snmp
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7579/ldap/servers/snmp
Modified Files:
main.c
Log Message:
Resolves: 496836
Summary: Corrected semaphore name used in SNMP subagent.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- main.c 24 Oct 2008 22:36:59 -0000 1.16
+++ main.c 21 Apr 2009 17:22:24 -0000 1.17
@@ -357,10 +357,10 @@
}
/* set the semaphore name */
- /* ".stats" + \0 = 7 */
- serv_p->stats_sem_name = malloc(strlen(p) + 7);
+ /* "/" + ".stats" + \0 = 8 */
+ serv_p->stats_sem_name = malloc(strlen(p) + 8);
if (serv_p->stats_sem_name != NULL) {
- snprintf(serv_p->stats_sem_name, strlen(p) + 7, "%s.stats", p);
+ snprintf(serv_p->stats_sem_name, strlen(p) + 8, "/%s.stats", p);
} else {
printf("ldap-agent: malloc error processing config file\n");
error = 1;
14 years, 11 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc GenericAuth.xul, 1.5, 1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xul/esc/chrome/content/esc
Modified Files:
GenericAuth.xul
Log Message:
Fix for #496410.
Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenericAuth.xul 26 Feb 2009 22:34:43 -0000 1.5
+++ GenericAuth.xul 18 Apr 2009 23:25:15 -0000 1.6
@@ -24,7 +24,7 @@
id="esc-window"
title="&genericAuthTitle;"
width="400"
- height="225"
+ height="240"
onload="UiLoad();"
onunload="UiUnload();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
14 years, 11 months
[Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.7, 1.8
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xul/esc
Modified Files:
application.ini
Log Message:
Fix for #496410.
Index: application.ini
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- application.ini 4 Feb 2009 01:43:46 -0000 1.7
+++ application.ini 18 Apr 2009 23:25:15 -0000 1.8
@@ -25,7 +25,7 @@
Name=ESC
;
; This field specifies your application's version. This field is optional.
-Version=1.1.0-1
+Version=1.1.0-3
;
; This field specifies your application's build ID (timestamp). This field is
; required.
14 years, 11 months
[Fedora-directory-commits] esc/src/lib/coolkey SmartCardMonitoringThread.cpp, 1.3, 1.4
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/lib/coolkey
Modified Files:
SmartCardMonitoringThread.cpp
Log Message:
Fix for #496410.
Index: SmartCardMonitoringThread.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/SmartCardMonitoringThread.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SmartCardMonitoringThread.cpp 24 Feb 2007 02:22:04 -0000 1.3
+++ SmartCardMonitoringThread.cpp 18 Apr 2009 23:25:15 -0000 1.4
@@ -104,12 +104,16 @@
char tBuff[56];
PK11SlotInfo *slot;
+ #ifdef LINUX
+ sleep(3);
+ #endif
+
PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
("%s SmartCardMonitoringThread::Execute.\n",GetTStamp(tBuff,56)));
//
// populate token names for already inserted tokens.
//
- PK11SlotList *sl =
+ /* PK11SlotList *sl =
PK11_FindSlotsByNames(mModule->dllName, NULL, NULL, PR_TRUE);
PK11SlotListElement *sle;
@@ -123,6 +127,8 @@
PK11_FreeSlotList(sl);
}
+ */
+
// loop starts..
do {
14 years, 11 months
[Fedora-directory-commits] esc/src/app/xpcom/tray Makefile.sdk, 1.1, 1.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xpcom/tray
Modified Files:
Makefile.sdk
Log Message:
Fix for #496410.
Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.sdk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.sdk 4 Feb 2009 01:43:46 -0000 1.1
+++ Makefile.sdk 18 Apr 2009 23:25:14 -0000 1.2
@@ -23,20 +23,20 @@
include $(CORE_DEPTH)/coreconf/rules.mk
ifeq ($(OS_ARCH),Linux)
-CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS)
+CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC
endif
# Change this to point at your Gecko SDK directory.
ifndef GECKO_SDK_PATH
-GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk
+GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9/sdk
endif
GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include
ifndef GECKO_INCLUDE_PATH
-GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre
+GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9
endif
ifndef GECKO_BIN_PATH
-GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre
+GECKO_BIN_PATH=/usr/lib/xulrunner-1.9
endif
ifeq ($(OS_ARCH),Darwin)
@@ -148,6 +148,10 @@
endif
+ifeq ($(OS_ARCH),Linux)
+GECKO_LD_LIBS= -L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a
+endif
+
# GCC only define which allows us to not have to #include mozilla-config
# in every .cpp file. If your not using GCC remove this line and add
14 years, 11 months
[Fedora-directory-commits] esc/src Makefile,1.5,1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822
Modified Files:
Makefile
Log Message:
Minor Linux build fixes.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 4 Feb 2009 01:43:46 -0000 1.5
+++ Makefile 17 Apr 2009 00:11:11 -0000 1.6
@@ -27,11 +27,11 @@
endif
ifeq ($(OS_ARCH), Darwin)
-DIRS += xulrunner app/xpcom/tray app/xpcom
+DIRS += app/xpcom/tray app/xpcom
endif
ifeq ($(OS_ARCH), Linux)
-DIRS += xulrunner lib/notifytray app/daemon app/xpcom/tray app/xpcom
+DIRS += lib/notifytray app/daemon app/xpcom/tray app/xpcom
endif
14 years, 11 months