2011-11-29 Rohini S <
[email protected]>
* patches/Python26-22-audio.diff: Fixes CVE-2010-1634
* specs/SUNWPython26.spec: Fixes CR 7085446
--- a/browser/installer/package-manifest.in Tue Oct 13 00:40:58 2009
+++ b/browser/installer/package-manifest.in Tue Oct 13 00:42:30 2009
@@ -96,6 +96,9 @@
@BINPATH@/README.txt
@BINPATH@/LICENSE
@BINPATH@/blocklist.xml
+#ifdef SOLARIS
+@BINPATH@/libjemalloc.so
+#endif
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/mozilla-xremote-client
--- a/memory/jemalloc/Makefile.in Tue Oct 13 00:54:10 2009
+++ b/memory/jemalloc/Makefile.in Tue Oct 13 00:54:53 2009
@@ -111,6 +111,7 @@
ifndef GNU_CC
MODULE_OPTIMIZE_FLAGS = -xO5
endif
+OS_LDFLAGS += -z interpose
endif
LIBRARY_NAME = jemalloc
@@ -117,7 +118,8 @@
# Build jemalloc as a shared lib. This is mandatory for Darwin, since a library
# init function is used on that platform.
-ifeq ($(OS_ARCH),Darwin)
+# On Solaris, we want to have the ability to use LD_PRELOAD to override malloc.
+ifneq (,$(filter Darwin SunOS,$(OS_ARCH)))
FORCE_SHARED_LIB= 1
else
DIST_INSTALL = 1
--- a/browser/installer/removed-files.in Tue Oct 13 00:54:10 2009
+++ b/browser/installer/removed-files.in Tue Oct 13 00:54:53 2009
@@ -787,7 +787,9 @@
chrome/icons/default/default.xpm
dictionaries/PL.dic
dictionaries/PL.aff
+#ifndef SOLARIS
libjemalloc.so
+#endif
icons/mozicon16.xpm
icons/mozicon50.xpm
#endif