1 |
anarchy 10/07/31 21:17:23 |
2 |
|
3 |
Added: 1000-thunderbird_shared_error.patch |
4 |
1001-xulrunner_fix_jemalloc_vs_aslr.patch |
5 |
1002-fix_double_buffer.diff |
6 |
1003-fix_arms_detections.patch |
7 |
1004-fix_sparc_build.patch |
8 |
2000-thunderbird_gentoo_install_dirs.patch README |
9 |
Removed: 1003-fix_sparc_build.patch |
10 |
Log: |
11 |
Bring patchset in sync with new naming scheme, remove unneeded patches |
12 |
|
13 |
Revision Changes Path |
14 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1000-thunderbird_shared_error.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1000-thunderbird_shared_error.patch?rev=1.1&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1000-thunderbird_shared_error.patch?rev=1.1&content-type=text/plain |
18 |
|
19 |
Index: 1000-thunderbird_shared_error.patch |
20 |
=================================================================== |
21 |
diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in |
22 |
--- thunderbird-3.0/mail/installer/Makefile.in.shared-error 2009-07-13 14:56:36.000000000 +0200 |
23 |
+++ thunderbird-3.0/mail/installer/Makefile.in 2009-07-14 12:41:16.000000000 +0200 |
24 |
@@ -94,9 +94,11 @@ endif |
25 |
# mozconfig instead. |
26 |
ifndef MAIL_PKG_SHARED |
27 |
ifndef BUILD_STATIC_LIBS |
28 |
+ifeq (BUILD_STATIC_LIBS, 1) |
29 |
$(error you need an "--enable-static" build to package a build) |
30 |
endif |
31 |
endif |
32 |
+endif |
33 |
|
34 |
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1001-xulrunner_fix_jemalloc_vs_aslr.patch |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1001-xulrunner_fix_jemalloc_vs_aslr.patch?rev=1.1&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1001-xulrunner_fix_jemalloc_vs_aslr.patch?rev=1.1&content-type=text/plain |
43 |
|
44 |
Index: 1001-xulrunner_fix_jemalloc_vs_aslr.patch |
45 |
=================================================================== |
46 |
diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c |
47 |
--- mozilla-orig/memory/jemalloc/jemalloc.c 2009-07-30 17:30:25.000000000 +0200 |
48 |
+++ mozilla/memory/jemalloc/jemalloc.c 2009-08-10 14:28:59.000000000 +0200 |
49 |
@@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib |
50 |
static const bool __isthreaded = true; |
51 |
#endif |
52 |
|
53 |
-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) |
54 |
+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) |
55 |
#define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */ |
56 |
#endif |
57 |
|
58 |
@@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si |
59 |
* We don't use MAP_FIXED here, because it can cause the *replacement* |
60 |
* of existing mappings, and we only want to create new mappings. |
61 |
*/ |
62 |
-#ifdef MALLOC_PAGEFILE |
63 |
- if (pfd != -1) { |
64 |
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | |
65 |
- MAP_NOSYNC | MAP_ALIGN, pfd, 0); |
66 |
- } else |
67 |
-#endif |
68 |
- { |
69 |
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | |
70 |
- MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0); |
71 |
- } |
72 |
+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE | |
73 |
+ MAP_NOSYNC| MAP_ANON, -1, 0); |
74 |
assert(ret != NULL); |
75 |
|
76 |
if (ret == MAP_FAILED) |
77 |
ret = NULL; |
78 |
+ else { |
79 |
+ uintptr_t aligned_ret; |
80 |
+ size_t extra_size; |
81 |
+ |
82 |
+ aligned_ret = (uintptr_t)ret + alignment - 1; |
83 |
+ aligned_ret &= ~(alignment - 1); |
84 |
+ extra_size = aligned_ret - (uintptr_t)ret; |
85 |
+ munmap(ret, extra_size); |
86 |
+ munmap(ret + extra_size + size, alignment - extra_size); |
87 |
+ ret = (void *)aligned_ret; |
88 |
+#ifdef MALLOC_PAGEFILE |
89 |
+ if (pfd != -1) { |
90 |
+ ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | |
91 |
+ MAP_NOSYNC | MAP_FIXED, pfd, 0); |
92 |
+ } |
93 |
+ if (ret == MAP_FAILED) |
94 |
+ ret = NULL; |
95 |
+#endif |
96 |
+ } |
97 |
return (ret); |
98 |
} |
99 |
#endif |
100 |
|
101 |
|
102 |
|
103 |
|
104 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.diff |
105 |
|
106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.diff?rev=1.1&view=markup |
107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.diff?rev=1.1&content-type=text/plain |
108 |
|
109 |
Index: 1002-fix_double_buffer.diff |
110 |
=================================================================== |
111 |
http://bugs.gentoo.org/324863 |
112 |
|
113 |
Fix buffer overflow with GCC 4.5 and -U_FORTIFY_SOURCE=2 |
114 |
|
115 |
Patch by Harald van Dijk |
116 |
|
117 |
--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp |
118 |
+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp |
119 |
@@ -187,7 +187,7 @@ |
120 |
struct hentry* hp = |
121 |
(struct hentry *) malloc (sizeof(struct hentry) + wbl + descl); |
122 |
if (!hp) return 1; |
123 |
- char * hpw = &(hp->word); |
124 |
+ char * hpw = HENTRY_WORD(hp); |
125 |
strcpy(hpw, word); |
126 |
if (ignorechars != NULL) { |
127 |
if (utf8) { |
128 |
--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx |
129 |
+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx |
130 |
@@ -57,6 +57,8 @@ |
131 |
#ifndef _HTYPES_HXX_ |
132 |
#define _HTYPES_HXX_ |
133 |
|
134 |
+#include <cstddef> |
135 |
+ |
136 |
#define ROTATE_LEN 5 |
137 |
|
138 |
#define ROTATE(v,q) \ |
139 |
@@ -68,7 +70,7 @@ |
140 |
#define H_OPT_PHON (1 << 2) |
141 |
|
142 |
// see also csutil.hxx |
143 |
-#define HENTRY_WORD(h) &(h->word) |
144 |
+#define HENTRY_WORD(h) ((char *) h + offsetof(struct hentry, word)) |
145 |
|
146 |
// approx. number of user defined words |
147 |
#define USERWORD 1000 |
148 |
|
149 |
|
150 |
|
151 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1003-fix_arms_detections.patch |
152 |
|
153 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1003-fix_arms_detections.patch?rev=1.1&view=markup |
154 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1003-fix_arms_detections.patch?rev=1.1&content-type=text/plain |
155 |
|
156 |
Index: 1003-fix_arms_detections.patch |
157 |
=================================================================== |
158 |
Fix arm OS detection |
159 |
|
160 |
https://bugs.gentoo.org/327783 |
161 |
https://bugzilla.mozilla.org/show_bug.cgi?id=577319 |
162 |
--- |
163 |
--- configure.in |
164 |
+++ configure.in |
165 |
@@ -1424,9 +1424,11 @@ |
166 |
CPU_ARCH="$OS_TEST" |
167 |
;; |
168 |
|
169 |
-arm) |
170 |
+arm*) |
171 |
if test "$OS_TARGET" = "WINCE"; then |
172 |
CPU_ARCH="$OS_TEST" |
173 |
+ else |
174 |
+ CPU_ARCH="arm" |
175 |
fi |
176 |
;; |
177 |
esac |
178 |
--- mozilla/js/src/configure.in |
179 |
+++ mozilla/js/src/configure.in |
180 |
@@ -1162,9 +1162,11 @@ |
181 |
CPU_ARCH="$OS_TEST" |
182 |
;; |
183 |
|
184 |
-arm) |
185 |
+arm*) |
186 |
if test "$OS_TARGET" = "WINCE"; then |
187 |
CPU_ARCH="$OS_TEST" |
188 |
+ else |
189 |
+ CPU_ARCH="arm" |
190 |
fi |
191 |
;; |
192 |
esac |
193 |
|
194 |
|
195 |
|
196 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1004-fix_sparc_build.patch |
197 |
|
198 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1004-fix_sparc_build.patch?rev=1.1&view=markup |
199 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1004-fix_sparc_build.patch?rev=1.1&content-type=text/plain |
200 |
|
201 |
Index: 1004-fix_sparc_build.patch |
202 |
=================================================================== |
203 |
--- comm-1.9.2/mozilla/js/src/nanojit/CodeAlloc.cpp |
204 |
+++ comm-1.9.2/mozilla/js/src/nanojit/CodeAlloc.cpp |
205 |
@@ -247,8 +247,20 @@ |
206 |
#endif |
207 |
|
208 |
#ifdef AVMPLUS_SPARC |
209 |
+#ifdef __linux__ // bugzilla 502369 |
210 |
+void sync_instruction_memory(caddr_t v, u_int len) |
211 |
+{ |
212 |
+ caddr_t end = v + len; |
213 |
+ caddr_t p = v; |
214 |
+ while (p < end) { |
215 |
+ asm("flush %0" : : "r" (p)); |
216 |
+ p += 32; |
217 |
+ } |
218 |
+} |
219 |
+#else |
220 |
extern "C" void sync_instruction_memory(caddr_t v, u_int len); |
221 |
#endif |
222 |
+#endif |
223 |
|
224 |
#if defined NANOJIT_IA32 || defined NANOJIT_X64 |
225 |
// intel chips have dcache/icache interlock |
226 |
|
227 |
|
228 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/2000-thunderbird_gentoo_install_dirs.patch |
229 |
|
230 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/2000-thunderbird_gentoo_install_dirs.patch?rev=1.1&view=markup |
231 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/2000-thunderbird_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain |
232 |
|
233 |
Index: 2000-thunderbird_gentoo_install_dirs.patch |
234 |
=================================================================== |
235 |
diff -ur work.orig/config/autoconf.mk.in work/config/autoconf.mk.in |
236 |
--- work.orig/config/autoconf.mk.in 2009-04-28 16:55:24.000000000 +0000 |
237 |
+++ work/config/autoconf.mk.in 2009-04-28 16:57:12.000000000 +0000 |
238 |
@@ -60,14 +60,14 @@ |
239 |
prefix = @prefix@ |
240 |
exec_prefix = @exec_prefix@ |
241 |
bindir = @bindir@ |
242 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
243 |
+includedir = @includedir@/thunderbird |
244 |
libdir = @libdir@ |
245 |
datadir = @datadir@ |
246 |
mandir = @mandir@ |
247 |
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
248 |
+idldir = $(datadir)/idl/thunderbird |
249 |
|
250 |
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
251 |
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
252 |
+installdir = $(libdir)/thunderbird |
253 |
+sdkdir = $(libdir)/thunderbird-devel |
254 |
|
255 |
MOZDEPTH = $(DEPTH)/mozilla |
256 |
DIST = $(MOZDEPTH)/dist |
257 |
|
258 |
|
259 |
|
260 |
1.1 src/patchsets/mozilla-thunderbird/3.1.1/README |
261 |
|
262 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/README?rev=1.1&view=markup |
263 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/README?rev=1.1&content-type=text/plain |
264 |
|
265 |
Index: README |
266 |
=================================================================== |
267 |
1000 - upstream patches |
268 |
2000 - gentoo specific patches |
269 |
2010 - prefix specific patches |
270 |
3000 - other distro patches |