|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
1 |
---
|
2 |
security/coreconf/rules.mk | 2 + |
|
3 |
security/manager/Makefile.in | 49 ------------------------------------ |
|
4 |
security/nss/cmd/shlibsign/Makefile | 2 - |
|
5 |
3 files changed, 3 insertions(+), 50 deletions(-) |
|
6 |
||
7 |
## 80_security_build.patch converted from dpatch file initially by Mike Hommey <glandium@debian.org> |
|
8 |
# |
|
9 |
# Dynamically link libnssckbi to both libplc4 and libplds4 instead of |
|
10 |
# linking statically. The static link issue has been more deeply been |
|
11 |
# taken care of in bz#302416. |
|
12 |
# Note we do build the shlibsign program but don't automatically create |
|
13 |
# the .chk file, since we will strip the library in debian/rules. |
|
14 |
||
|
148
by Fabien Tassin
* Refresh diverged patch: |
15 |
Index: seamonkey-1.1.11+nobinonly/security/coreconf/rules.mk
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
16 |
===================================================================
|
|
148
by Fabien Tassin
* Refresh diverged patch: |
17 |
--- seamonkey-1.1.11+nobinonly.orig/security/coreconf/rules.mk
|
18 |
+++ seamonkey-1.1.11+nobinonly/security/coreconf/rules.mk
|
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
19 |
@@ -40,16 +40,18 @@
|
20 |
### R U L E S O F E N G A G E M E N T ### |
|
21 |
### ### |
|
22 |
####################################################################### |
|
23 |
||
24 |
####################################################################### |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
25 |
# Double-Colon rules for utilizing the binary release model. # |
26 |
####################################################################### |
|
27 |
||
28 |
+CFLAGS += -g
|
|
29 |
+
|
|
30 |
all:: export libs |
|
31 |
||
32 |
ifeq ($(AUTOCLEAN),1) |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
33 |
autobuild:: clean export private_export libs program install |
34 |
else |
|
35 |
autobuild:: export private_export libs program install |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
36 |
endif |
37 |
||
|
148
by Fabien Tassin
* Refresh diverged patch: |
38 |
Index: seamonkey-1.1.11+nobinonly/security/manager/Makefile.in
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
39 |
===================================================================
|
|
148
by Fabien Tassin
* Refresh diverged patch: |
40 |
--- seamonkey-1.1.11+nobinonly.orig/security/manager/Makefile.in
|
41 |
+++ seamonkey-1.1.11+nobinonly/security/manager/Makefile.in
|
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
42 |
@@ -48,32 +48,30 @@
|
43 |
PACKAGE_FILE = psm.pkg |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
44 |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
45 |
ifndef MOZ_NATIVE_NSS |
46 |
PACKAGE_VARS += \ |
|
47 |
NSS3_LIB \ |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
48 |
SMIME3_LIB \ |
49 |
SSL3_LIB \ |
|
50 |
SOFTOKEN3_LIB \ |
|
51 |
- SOFTOKEN3_CHK \
|
|
52 |
LOADABLE_ROOT_MODULE \ |
|
|
43
by glandium
* debian/iceape-browser.install: Install libfreebl. |
53 |
HAVE_FREEBL_LIBS \ |
54 |
HAVE_FREEBL_LIBS_32 \ |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
55 |
HAVE_FREEBL_LIBS_32INT64 \ |
56 |
HAVE_FREEBL_LIBS_64 \ |
|
57 |
$(NULL) |
|
58 |
||
59 |
LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) |
|
60 |
endif |
|
61 |
||
62 |
NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
63 |
SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) |
64 |
SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) |
|
65 |
SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) |
|
66 |
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
|
|
67 |
||
|
43
by glandium
* debian/iceape-browser.install: Install libfreebl. |
68 |
# Default |
69 |
HAVE_FREEBL_LIBS = 1 |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
70 |
|
71 |
# 32-bit HP-UX PA-RISC |
|
72 |
ifeq ($(OS_ARCH), HP-UX) |
|
73 |
ifneq ($(OS_TEST), ia64) |
|
74 |
ifndef HAVE_64BIT_OS |
|
75 |
@@ -94,33 +92,27 @@
|
|
76 |
HAVE_FREEBL_LIBS_32 = 1 |
|
77 |
HAVE_FREEBL_LIBS_32INT64 = 1 |
|
78 |
endif |
|
79 |
endif |
|
80 |
endif |
|
|
43
by glandium
* debian/iceape-browser.install: Install libfreebl. |
81 |
|
82 |
ifdef HAVE_FREEBL_LIBS |
|
83 |
FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX) |
|
84 |
-FREEBL_CHK = $(DLL_PREFIX)freebl3.chk
|
|
85 |
endif |
|
86 |
ifdef HAVE_FREEBL_LIBS_32 |
|
87 |
FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX) |
|
88 |
-FREEBL_32INT_CHK = libfreebl_32int_3.chk
|
|
89 |
FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX) |
|
90 |
-FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk
|
|
91 |
endif |
|
92 |
ifdef HAVE_FREEBL_LIBS_32INT64 |
|
93 |
FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX) |
|
94 |
-FREEBL_32INT64_CHK = libfreebl_32int64_3.chk
|
|
95 |
endif |
|
96 |
ifdef HAVE_FREEBL_LIBS_64 |
|
97 |
FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX) |
|
98 |
-FREEBL_64INT_CHK = libfreebl_64int_3.chk
|
|
99 |
FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX) |
|
100 |
-FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
|
|
101 |
endif |
|
102 |
||
|
55
by glandium
* Merged changes from experimental branch |
103 |
ABS_DIST := $(shell cd $(DIST) && pwd) |
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
104 |
ifeq ($(HOST_OS_ARCH),WINNT) |
105 |
ifdef CYGDRIVE_MOUNT |
|
106 |
ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\|/|g') |
|
107 |
endif |
|
108 |
ifneq (,$(filter mingw%,$(host_os))) |
|
109 |
@@ -201,33 +193,30 @@
|
|
110 |
LINK="$(LD)" \ |
|
111 |
AS="$(AS)" \ |
|
112 |
AR='$(AR) $(AR_FLAGS:$@=$$@)' \ |
|
113 |
RANLIB="$(RANLIB)" \ |
|
114 |
RC="$(RC) $(RCFLAGS)" \ |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
115 |
OS_ARCH="$(OS_ARCH)" \ |
116 |
CPU_ARCH="$(TARGET_CPU)" \ |
|
117 |
$(NULL) |
|
118 |
-SKIP_CHK=1
|
|
119 |
endif |
|
120 |
SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile |
|
121 |
||
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
122 |
include $(topsrcdir)/config/rules.mk |
123 |
||
124 |
# Attempt to properly handle NSS' refusal to implement a dependency system |
|
125 |
export:: .nss.cleaned |
|
126 |
||
127 |
.nss.cleaned: .nss.checkout |
|
|
55
by glandium
* Merged changes from experimental branch |
128 |
ifndef MOZ_NATIVE_NSS |
|
1
by glandium
Import Iceape 1.0.6-1 |
129 |
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean |
130 |
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean |
|
131 |
-ifndef SKIP_CHK
|
|
132 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean |
|
133 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean |
|
134 |
-endif
|
|
135 |
touch $@ |
|
|
55
by glandium
* Merged changes from experimental branch |
136 |
endif |
|
1
by glandium
Import Iceape 1.0.6-1 |
137 |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
138 |
GARBAGE += .nss.cleaned |
139 |
||
140 |
.nss.checkout: |
|
141 |
ifndef MOZ_NATIVE_NSS |
|
142 |
touch $(srcdir)/$@ |
|
|
148
by Fabien Tassin
* Refresh diverged patch: |
143 |
@@ -255,99 +244,63 @@
|
144 |
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export |
|
145 |
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs |
|
146 |
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs |
|
147 |
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs |
|
148 |
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean |
|
149 |
# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h. |
|
150 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export |
|
151 |
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins" |
|
|
1
by glandium
Import Iceape 1.0.6-1 |
152 |
-ifndef SKIP_CHK
|
153 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) |
|
154 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) |
|
155 |
-endif
|
|
156 |
$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin |
|
157 |
-ifndef SKIP_CHK
|
|
158 |
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
|
|
159 |
-endif
|
|
160 |
$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin |
|
161 |
$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin |
|
162 |
$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin |
|
|
43
by glandium
* debian/iceape-browser.install: Install libfreebl. |
163 |
$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin |
164 |
ifdef HAVE_FREEBL_LIBS |
|
165 |
-ifndef SKIP_CHK
|
|
166 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
|
|
167 |
-endif
|
|
168 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin |
|
169 |
endif |
|
170 |
ifdef HAVE_FREEBL_LIBS_32 |
|
171 |
-ifndef SKIP_CHK
|
|
172 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
|
|
173 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
|
|
174 |
-endif
|
|
175 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin |
|
176 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin |
|
177 |
endif |
|
178 |
ifdef HAVE_FREEBL_LIBS_32INT64 |
|
179 |
-ifndef SKIP_CHK
|
|
180 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
|
|
181 |
-endif
|
|
182 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin |
|
183 |
endif |
|
184 |
ifdef HAVE_FREEBL_LIBS_64 |
|
185 |
-ifndef SKIP_CHK
|
|
186 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
|
|
187 |
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
|
|
188 |
-endif
|
|
189 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin |
|
190 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin |
|
191 |
endif |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
192 |
endif |
193 |
$(MAKE) -C boot $@ |
|
194 |
$(MAKE) -C ssl $@ |
|
195 |
$(MAKE) -C locales $@ |
|
196 |
ifdef MOZ_XUL |
|
197 |
$(MAKE) -C pki $@ |
|
198 |
endif |
|
199 |
||
|
1
by glandium
Import Iceape 1.0.6-1 |
200 |
install:: |
|
55
by glandium
* Merged changes from experimental branch |
201 |
ifndef MOZ_NATIVE_NSS |
|
1
by glandium
Import Iceape 1.0.6-1 |
202 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) |
203 |
-ifndef SKIP_CHK
|
|
204 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
|
|
205 |
-endif
|
|
206 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) |
|
207 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) |
|
208 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) |
|
|
43
by glandium
* debian/iceape-browser.install: Install libfreebl. |
209 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) |
210 |
ifdef HAVE_FREEBL_LIBS |
|
211 |
-ifndef SKIP_CHK
|
|
212 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
|
|
213 |
-endif
|
|
214 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) |
|
215 |
endif |
|
216 |
ifdef HAVE_FREEBL_LIBS_32 |
|
217 |
-ifndef SKIP_CHK
|
|
218 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
|
|
219 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
|
|
220 |
-endif
|
|
221 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) |
|
222 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) |
|
223 |
endif |
|
224 |
ifdef HAVE_FREEBL_LIBS_32INT64 |
|
225 |
-ifndef SKIP_CHK
|
|
226 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
|
|
227 |
-endif
|
|
228 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) |
|
229 |
endif |
|
230 |
ifdef HAVE_FREEBL_LIBS_64 |
|
231 |
-ifndef SKIP_CHK
|
|
232 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
|
|
233 |
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
|
|
234 |
-endif
|
|
235 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) |
|
236 |
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) |
|
237 |
endif |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
238 |
endif |
239 |
$(MAKE) -C boot $@ |
|
240 |
$(MAKE) -C ssl $@ |
|
241 |
$(MAKE) -C locales $@ |
|
242 |
ifdef MOZ_XUL |
|
|
148
by Fabien Tassin
* Refresh diverged patch: |
243 |
@@ -359,20 +312,18 @@
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
244 |
$(MAKE) -C ssl $@ |
245 |
$(MAKE) -C locales $@ |
|
246 |
ifdef MOZ_XUL |
|
247 |
$(MAKE) -C pki $@ |
|
248 |
endif |
|
|
55
by glandium
* Merged changes from experimental branch |
249 |
ifndef MOZ_NATIVE_NSS |
|
1
by glandium
Import Iceape 1.0.6-1 |
250 |
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean |
251 |
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean |
|
252 |
-ifndef SKIP_CHK
|
|
253 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean |
|
254 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean |
|
|
55
by glandium
* Merged changes from experimental branch |
255 |
endif |
|
1
by glandium
Import Iceape 1.0.6-1 |
256 |
-endif
|
257 |
||
258 |
echo-requires-recursive:: |
|
259 |
$(MAKE) -C boot $@ |
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
260 |
$(MAKE) -C ssl $@ |
261 |
$(MAKE) -C pki $@ |
|
262 |
$(MAKE) -C locales $@ |
|
263 |
||
|
148
by Fabien Tassin
* Refresh diverged patch: |
264 |
Index: seamonkey-1.1.11+nobinonly/security/nss/cmd/shlibsign/Makefile
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
265 |
===================================================================
|
|
148
by Fabien Tassin
* Refresh diverged patch: |
266 |
--- seamonkey-1.1.11+nobinonly.orig/security/nss/cmd/shlibsign/Makefile
|
267 |
+++ seamonkey-1.1.11+nobinonly/security/nss/cmd/shlibsign/Makefile
|
|
|
96
by Fabien Tassin
* Migrate from dpatch to quilt |
268 |
@@ -94,10 +94,10 @@
|
269 |
$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ |
|
270 |
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) |
|
271 |
else |
|
272 |
cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \ |
|
273 |
$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ |
|
274 |
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) |
|
275 |
endif |
|
276 |
||
277 |
-libs install :: $(CHECKLOC)
|
|
278 |
+libs install ::
|
|
279 |