ldap/servers
by Noriko Hosoi
ldap/servers/slapd/slap.h | 2 ++
ldap/servers/slapd/task.c | 21 +++++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 0cd1fc49e67e396cf5391a591c83fd1ad0df9d2b
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Mar 16 16:45:33 2010 -0700
573896 - initializing subtree with invalid syntax crashes ns-slapd
https://bugzilla.redhat.com/show_bug.cgi?id=573896
Description: When an import is executed using a task mechanism,
slapi_task_log_notice is called for logging, where task_log field
points the memory storing the log messages. If multiple log
messages were logged by multiple worker threads simultaneously,
there was a chance that the address of the log message was switched
by realloc while the other threads were accessing the old address.
This patch introduces task_log_lock per task to protect task_log.
Note: slapi_ch_malloc and its friends never return NULL. They rather
exits. Thus, to avoid the confusion which may look leaking the
lock, I eliminated 2 error returns from slapi_task_log_notice.
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 589756f..140158a 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1392,6 +1392,8 @@ struct slapi_task {
TaskCallbackFn cancel; /* task has been cancelled by user */
TaskCallbackFn destructor; /* task entry is being destroyed */
int task_refcount;
+ PRLock *task_log_lock; /* To protect task_log to be realloced if
+ it's in use */
} slapi_task;
/* End of interface to support online tasks **********************************/
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index 3324dea..67109b2 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -228,6 +228,9 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
PR_vsnprintf(buffer, LOG_BUFFER, format, ap);
va_end(ap);
+ if (task->task_log_lock) {
+ PR_Lock(task->task_log_lock);
+ }
len = 2 + strlen(buffer) + (task->task_log ? strlen(task->task_log) : 0);
if ((len > MAX_SCROLLBACK_BUFFER) && task->task_log) {
size_t i;
@@ -241,8 +244,6 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
i++;
len = strlen(task->task_log) - i + 2 + strlen(buffer);
newbuf = (char *)slapi_ch_malloc(len);
- if (! newbuf)
- return; /* out of memory? */
strcpy(newbuf, task->task_log + i);
slapi_ch_free((void **)&task->task_log);
task->task_log = newbuf;
@@ -253,13 +254,14 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
} else {
task->task_log = (char *)slapi_ch_realloc(task->task_log, len);
}
- if (! task->task_log)
- return; /* out of memory? */
}
if (task->task_log[0])
strcat(task->task_log, "\n");
strcat(task->task_log, buffer);
+ if (task->task_log_lock) {
+ PR_Unlock(task->task_log_lock);
+ }
slapi_task_status_changed(task);
}
@@ -278,7 +280,13 @@ void slapi_task_status_changed(Slapi_Task *task)
return;
}
+ if (task->task_log_lock) {
+ PR_Lock(task->task_log_lock);
+ }
NEXTMOD(TASK_LOG_NAME, task->task_log);
+ if (task->task_log_lock) {
+ PR_Unlock(task->task_log_lock);
+ }
NEXTMOD(TASK_STATUS_NAME, task->task_status);
sprintf(s1, "%d", task->task_exitcode);
sprintf(s2, "%d", task->task_progress);
@@ -505,6 +513,8 @@ new_task(const char *dn)
slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, dn,
LDAP_SCOPE_SUBTREE, "(objectclass=*)", task_deny, NULL);
#endif
+ /* To protect task_log to be realloced if it's in use */
+ task->task_log_lock = PR_NewLock();
return task;
}
@@ -652,6 +662,9 @@ static void task_generic_destructor(Slapi_Task *task)
if (task->task_status) {
slapi_ch_free((void **)&task->task_status);
}
+ if (task->task_log_lock) {
+ PR_DestroyLock(task->task_log_lock);
+ }
task->task_log = task->task_status = NULL;
}
14 years, 1 month
esc/src/lib/coolkey CoolKey.cpp, 1.11, 1.12 Mac-universal.mk, 1.2, 1.3 SmartCardMonitoringThread.cpp, 1.6, 1.7 common.mk, 1.2, 1.3
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/lib/coolkey
Modified Files:
CoolKey.cpp Mac-universal.mk SmartCardMonitoringThread.cpp
common.mk
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoolKey.cpp 19 Jun 2009 21:03:40 -0000 1.11
+++ CoolKey.cpp 17 Mar 2010 00:43:54 -0000 1.12
@@ -1107,9 +1107,7 @@
goto done;
}
-#ifndef DARWIN
CKYCardConnection_BeginTransaction(conn);
-#endif
apduRC = 0;
status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
if (status != CKYSUCCESS) {
@@ -1154,9 +1152,7 @@
done:
if (conn) {
-#ifndef DARWIN
CKYCardConnection_EndTransaction(conn);
-#endif
CKYCardConnection_Disconnect(conn);
CKYCardConnection_Destroy(conn);
}
Index: Mac-universal.mk
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/Mac-universal.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mac-universal.mk 19 Jan 2007 22:29:24 -0000 1.2
+++ Mac-universal.mk 17 Mar 2010 00:43:54 -0000 1.3
@@ -31,14 +31,13 @@
mkdir -p $(UNIVERSAL_OFFSET_PPC)
mkdir -p $(UNIVERSAL_OFFSET_386)
- sudo gcc_select 4.0
+
echo "Build i386."
make -f common.mk OSX_ARCH_FLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)
make -f common.mk clean
- sudo gcc_select 3.3
echo "Build ppc."
make -f common.mk OSX_ARCH_FLAGS="-arch ppc"
cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC)
@@ -48,8 +47,6 @@
ranlib $(OBJDIR)/$(DARWIN_LIB_NAME)
make -f common.mk install
- sudo gcc_select 4.0
-
clean:
"Darwing clean."
make -f common.mk clean
Index: SmartCardMonitoringThread.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/SmartCardMonitoringThread.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SmartCardMonitoringThread.cpp 17 Nov 2009 23:44:37 -0000 1.6
+++ SmartCardMonitoringThread.cpp 17 Mar 2010 00:43:54 -0000 1.7
@@ -159,6 +159,12 @@
PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
("%s SmartCardMonitoringThread::info %p : \n",GetTStamp(tBuff,56),info));
+ // On Mac give the tokend a chance before hitting PK11_IsPresent
+
+ #ifdef DARWIN
+ PR_Sleep(PR_SecondsToInterval(1));
+ #endif
+
PRBool isPresent = PK11_IsPresent(slot);
PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
Index: common.mk
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/common.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common.mk 2 Feb 2007 23:56:45 -0000 1.2
+++ common.mk 17 Mar 2010 00:43:54 -0000 1.3
@@ -43,10 +43,6 @@
DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\"
DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
-ifdef DARWIN_GCC_VERSION
- echo "blooie"
- sudo gcc_select $(GCC_VERSION)
-endif
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
14 years, 1 month
esc/src/app/xul/esc/chrome/locale/en-US esc.dtd, 1.6, 1.7
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-serv22673/src/app/xul/esc/chrome/locale/en-US
Modified Files:
esc.dtd
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: esc.dtd
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc.dtd 7 May 2007 23:50:39 -0000 1.6
+++ esc.dtd 17 Mar 2010 00:43:53 -0000 1.7
@@ -85,6 +85,12 @@
<!ENTITY tpsConfigDesc2 "Second, you must format it from the main Smart Card Manager window.">
<!ENTITY tpsConfigDesc3 "Enter the location of the smart card server (such as https://smartcardserver.example.com:7888)">
<!ENTITY diagnosticsMessage "The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.">
+<!ENTITY macmenu.hide "Hide ESC">
+<!ENTITY macmenu.services "Services">
+<!ENTITY macmenu.hideothers "Hide Others">
+<!ENTITY macmenu.showall "Show All">
+<!ENTITY macmenu.quit "Quit">
+<!ENTITY macmenu.go "GO">
<!ENTITY dontLaunchBrowser "Don't launch the default browser when enrolled card is inserted.">
<!ENTITY Close.accesskey "C">
<!ENTITY OK.accesskey "O">
14 years, 1 month
esc/src/app/xul/esc/components escCLH.js,1.4,1.5
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/components
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/app/xul/esc/components
Modified Files:
escCLH.js
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: escCLH.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/components/escCLH.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- escCLH.js 27 Feb 2009 03:31:43 -0000 1.4
+++ escCLH.js 17 Mar 2010 00:43:54 -0000 1.5
@@ -81,7 +81,7 @@
var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);
win = wwatch.openWindow(null, chromeURI, "_blank",
- "chrome,dialog,height=-1,width=-1,popup=yes", cmdLine);
+ "chrome,dialog,height=0,width=0,titlebar=no", cmdLine);
}
14 years, 1 month
esc/src/lib/NssHttpClient manifest.mn,1.5,1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/lib/NssHttpClient
Modified Files:
manifest.mn
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- manifest.mn 19 Jun 2009 21:03:40 -0000 1.5
+++ manifest.mn 17 Mar 2010 00:43:54 -0000 1.6
@@ -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 -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss
+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 -I../coolkey
CPPSRCS = \
Cache.cpp \
14 years, 1 month
esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.29, 1.30 GenericAuth.xul, 1.6, 1.7 hiddenWindow.xul, 1.1, 1.2
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-serv22673/src/app/xul/esc/chrome/content/esc
Modified Files:
ESC.js GenericAuth.xul hiddenWindow.xul
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ESC.js 15 Mar 2010 20:51:27 -0000 1.29
+++ ESC.js 17 Mar 2010 00:43:52 -0000 1.30
@@ -4793,3 +4793,11 @@
}
+
+function QuitApplication()
+{
+ Components
+ .classes['@mozilla.org/toolkit/app-startup;1']
+ .getService(Components.interfaces.nsIAppStartup)
+ .quit(Components.interfaces.nsIAppStartup.eForceQuit);
+}
Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GenericAuth.xul 18 Apr 2009 23:25:15 -0000 1.6
+++ GenericAuth.xul 17 Mar 2010 00:43:53 -0000 1.7
@@ -24,7 +24,7 @@
id="esc-window"
title="&genericAuthTitle;"
width="400"
- height="240"
+ height="260"
onload="UiLoad();"
onunload="UiUnload();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
Index: hiddenWindow.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/hiddenWindow.xul,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hiddenWindow.xul 13 Sep 2006 17:59:41 -0000 1.1
+++ hiddenWindow.xul 17 Mar 2010 00:43:53 -0000 1.2
@@ -17,10 +17,27 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
id="esc-window"
- title="&escTitle;"
+ title=""
onload="hiddenWindowStartup();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
<script src="TRAY.js"/>
- <script src="ESC.js"/>
+<script src="ESC.js"/>
+
+ <toolbox hidden="true">
+ <menubar>
+ <menuseparator/>
+ <menu id="menu_FilePopup" label="&macmenu.go;">
+ <menupopup id="go_menu">
+ <menuitem id="menu_go" label="&administerKeys;" oncommand="NotifyESCOfTrayEvent();"/>
+ <menuitem id="menu_mac_services" label="&macmenu.services;"/>
+ <menuitem id="menu_mac_hide_app" label="&macmenu.hide;" key="key_hideThisApp"/>
+ <menuitem id="menu_mac_hide_others" label="&macmenu.hideothers;" key="key_hideOtherApps"/>
+ <menuitem id="menu_mac_show_all" label="&macmenu.showall;"/>
+ <menuitem id="menu_FileQuitItem" label="&macmenu.quit;" key="key_quit" oncommand="QuitApplication();" />
+
+ </menupopup>
+ </menu>
+ </menubar>
+ </toolbox>
</window>
14 years, 1 month
esc/mac/coolkey_package_data/Resources postflight, 1.1, 1.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/mac/coolkey_package_data/Resources
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/mac/coolkey_package_data/Resources
Modified Files:
postflight
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: postflight
===================================================================
RCS file: /cvs/dirsec/esc/mac/coolkey_package_data/Resources/postflight,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postflight 2 Aug 2007 18:22:20 -0000 1.1
+++ postflight 17 Mar 2010 00:43:51 -0000 1.2
@@ -43,3 +43,15 @@
/Applications/Utilities/PK11Install/pk11install -v "name='CoolKey Module' library='/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib' NSS="slotParams={0x1=[slotFlags=PublicCerts]}""
+if [ ! -f "/System/Library/Security/tokend/A_COOLKEY.tokend" ]
+then
+ rm -rf "/System/Library/Security/tokend/A_COOLKEY.tokend" ]
+fi
+
+rm -f "/Applications/ESC.app/Contents/Resources/components/rhCoolKey.xpt" ]
+
+rm -f "/Applications/ESC.app/Contents/Resources/components/rhTray.xpt" ]
+
+rm -rf "/Applications/ESC.app/Contents/Frameworks/XUL.framework/Versions/1.8.0.7"
+
+exit 0
14 years, 1 month
esc/mac/misc libtool.coolkey.patch,1.1,1.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/mac/misc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/mac/misc
Modified Files:
libtool.coolkey.patch
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
libtool.coolkey.patch:
libtool | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: libtool.coolkey.patch
===================================================================
RCS file: /cvs/dirsec/esc/mac/misc/libtool.coolkey.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtool.coolkey.patch 2 Aug 2007 18:22:21 -0000 1.1
+++ libtool.coolkey.patch 17 Mar 2010 00:43:51 -0000 1.2
@@ -5,7 +5,7 @@
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
-+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
++archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
@@ -15,15 +15,15 @@
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
-archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
-+archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
++archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
# Commands used to build a loadable module (assumed same as above if empty)
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags"
-module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 \$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
# Commands to strip libraries.
old_striplib=""
14 years, 1 month
esc/src/app/xpcom/tray Makefile.sdk, 1.2, 1.3 rhMacTray.cpp, 1.5, 1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/app/xpcom/tray
Modified Files:
Makefile.sdk rhMacTray.cpp
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.sdk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.sdk 18 Apr 2009 23:25:14 -0000 1.2
+++ Makefile.sdk 17 Mar 2010 00:43:52 -0000 1.3
@@ -43,6 +43,7 @@
ifndef GECKO_SDK_PATH
GECKO_SDK_PATH =/Users/jmagne/Desktop/gecko-sdk-mac-universal
endif
+GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/sdk/include
GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include
GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin
ifndef XUL_FRAMEWORK_PATH
@@ -113,7 +114,7 @@
ifeq ($(OS_ARCH),Darwin)
ifdef PPC_BUILD
-CXX = c++-3.3
+CXX = c++-4.0
CPPFLAGS += -arch ppc
else
CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386
@@ -140,7 +141,7 @@
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
+GECKO_LD_LIBS=-W1,dead_strip $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a -Wl,-executable_path,$(GECKO_SDK_PATH)/lib -lxpcom
endif
ifeq ($(OS_ARCH),WINNT)
@@ -164,7 +165,7 @@
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
+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 -I $(GECKO_INCLUDE_PATH)/nspr
COOL_INCLUDES = -I $(CORE_INC)/ckymanager -I $(CORE_INC)/httpchuncked
@@ -200,7 +201,7 @@
endif
-GECKO_LDFLAGS= -lnspr4 \
+GECKO_LDFLAGS= -L$(GECKO_SDK_PATH)/lib -lnspr4 \
-lplds4 -lplc4 -ldl -lpthread \
$(GECKO_LD_LIBS)
Index: rhMacTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhMacTray.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rhMacTray.cpp 24 Feb 2007 02:04:32 -0000 1.5
+++ rhMacTray.cpp 17 Mar 2010 00:43:52 -0000 1.6
@@ -26,7 +26,6 @@
int rhTray::mInitialized = 0;
WindowRef rhTray::mWnd = NULL;
MenuRef rhTray::mDockMenu = NULL;
-MenuRef rhTray::mRootMenu = NULL;
ProcessSerialNumber rhTray::mPSN;
EventHandlerRef rhTray::mEventHandlerRef=NULL;
EventHandlerUPP rhTray::mEventHandlerUPP=NULL;
@@ -260,43 +259,6 @@
}
}
- MenuRef tGoMenu;
- ::CreateNewMenu(1,0,&tGoMenu);
-
- if(tGoMenu)
- {
- SetMenuID (tGoMenu,GO_MENU_ID);
- }
- else
- {
- return S_OK;
- }
-
- MenuRef tRootMenu;
- ::CreateNewMenu(0, 0, &tRootMenu);
-
- if(!tRootMenu)
- {
- return S_OK;
- }
-
- MenuItemIndex goItem;
-
- ::AppendMenuItemTextWithCFString( tGoMenu, CFSTR("Show Manage Smart Cards"), 0,MENU_ITEM_ID_BASE , &goItem );
-
- ::SetMenuTitleWithCFString( tGoMenu, CFSTR("Go") );
-
- OSStatus rootResult = ::SetRootMenu(tRootMenu);
-
- if(rootResult == noErr)
- {
- mRootMenu = AcquireRootMenu();
-
- MenuItemIndex myMenuIndex;
- AppendMenuItemTextWithCFString( tRootMenu, NULL, 0, 0, &myMenuIndex );
- SetMenuItemHierarchicalMenu(tRootMenu, myMenuIndex, tGoMenu);
- }
-
mInitialized = 1;
return S_OK;
}
@@ -329,21 +291,16 @@
if(mDockMenu)
{
- ::ReleaseMenu(mDockMenu);
+ ::DisposeMenu(mDockMenu);
}
MenuRef goMenu = GetMenuHandle (GO_MENU_ID);
if(goMenu)
{
- ::ReleaseMenu(goMenu);
+ ::DisposeMenu(goMenu);
}
- if(mRootMenu)
- {
- ::ReleaseMenu(mRootMenu);
- }
-
return S_OK;
}
@@ -755,7 +712,6 @@
case kHICommandQuit:
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kHICommandQuit! \n",GetTStamp(tBuff,56)));
-
break;
case MENU_ITEM_ID_BASE:
14 years, 1 month
esc/src/app/xul/esc application.ini,1.10,1.11
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22673/src/app/xul/esc
Modified Files:
application.ini
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: application.ini
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- application.ini 17 Nov 2009 23:44:36 -0000 1.10
+++ application.ini 17 Mar 2010 00:43:52 -0000 1.11
@@ -25,11 +25,11 @@
Name=ESC
;
; This field specifies your application's version. This field is optional.
-Version=1.1.0-9
+Version=1.1.0-12
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=0000001011
+BuildID=0000001012
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
14 years, 1 month