1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
--- mozilla.firefox.1.5.0.6.rpmdist/embedding/browser/photon/src/Makefile.in 2005-04-26 10:37:02.000000000 -0700
+++ mozilla/embedding/browser/photon/src/Makefile.in 2006-08-23 19:01:13.000000000 -0700
@@ -100,6 +100,7 @@
XP_LIBS += \
$(PNG_LIBS) \
$(JPEG_LIBS) \
+ $(VAL_LIBS) \
$(ZLIB_LIBS) \
$(NULL)
--- mozilla.firefox.1.5.0.6.rpmdist/modules/libpr0n/build/Makefile.in 2004-12-09 11:28:21.000000000 -0800
+++ mozilla/modules/libpr0n/build/Makefile.in 2006-08-23 19:01:13.000000000 -0700
@@ -89,6 +89,7 @@
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(JPEG_LIBS) \
+ $(VAL_LIBS) \
$(PNG_LIBS) $(ZLIB_LIBS) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
--- mozilla.firefox.1.5.0.6.rpmdist/netwerk/dns/src/nsDNSService2.cpp 2005-10-18 14:25:45.000000000 -0700
+++ mozilla/netwerk/dns/src/nsDNSService2.cpp 2006-08-23 19:01:13.000000000 -0700
@@ -122,6 +122,10 @@
NS_ENSURE_STATE(mHostRecord->addr);
mIter = nsnull; // no iterations
+ if (!mHostRecord->addr) {
+ mDone = !mIter;
+ return NS_ERROR_NOT_AVAILABLE;
+ }
memcpy(addr, mHostRecord->addr, sizeof(PRNetAddr));
// set given port
port = PR_htons(port);
--- mozilla.firefox.1.5.0.6.rpmdist/nsprpub/config/autoconf.mk.in 2006-02-22 15:03:11.000000000 -0800
+++ mozilla/nsprpub/config/autoconf.mk.in 2006-08-23 19:01:13.000000000 -0700
@@ -34,6 +34,7 @@
LIBNSPR = @LIBNSPR@
LIBPLC = @LIBPLC@
+VAL_LIBS = @VAL_LIBS@
CROSS_COMPILE = @CROSS_COMPILE@
BUILD_OPT = @MOZ_OPTIMIZE@
--- mozilla.firefox.1.5.0.6.rpmdist/nsprpub/config/nspr-config.in 2005-05-10 18:03:44.000000000 -0700
+++ mozilla/nsprpub/config/nspr-config.in 2006-08-23 19:01:13.000000000 -0700
@@ -138,6 +138,6 @@
libdirs="$libdirs $i"
fi
done
- echo $libdirs @OS_LIBS@
+ echo $libdirs @VAL_LIBS@ @OS_LIBS@
fi
--- mozilla.firefox.1.5.0.6.rpmdist/nsprpub/configure.in 2006-02-22 15:03:11.000000000 -0800
+++ mozilla/nsprpub/configure.in 2006-08-23 19:01:13.000000000 -0700
@@ -2138,6 +2138,52 @@
dnl AC_CHECK_LIB(thread, main)
dnl AC_CHECK_LIB(vms_jackets, main)
+dnl Check for libval, the DNSSEC validation library
+dnl ========================================================
+AC_ARG_WITH(system-val,
+[ --with-system-val[=PFX]
+ Use system libval [installed at prefix PFX]],
+ VAL_DIR=$withval)
+
+AC_ARG_WITH(system-sres,
+[ --with-system-sres[=PFX]
+ Use system libsres [installed at prefix PFX]],
+ SRES_DIR=$withval)
+
+AC_ARG_WITH(system-openssl,
+[ --with-system-openssl[=PFX]
+ Use system openssl libraries [installed at prefix PFX]],
+ OPENSSL_DIR=$withval)
+
+_SAVE_CFLAGS=$CFLAGS
+_SAVE_LDFLAGS=$LDFLAGS
+_SAVE_LIBS=$LIBS
+
+if test -n "${OPENSSL_DIR}"; then
+ CFLAGS="-I${OPENSSL_DIR}/include $CFLAGS"
+ LDFLAGS="-L${OPENSSL_DIR}/lib $LDFLAGS"
+fi
+if test -n "${VAL_DIR}"; then
+ CFLAGS="-I${VAL_DIR}/include $CFLAGS"
+ LDFLAGS="-L${VAL_DIR}/lib $LDFLAGS"
+fi
+if test -n "${SRES_DIR}"; then
+ CFLAGS="-I${SRES_DIR}/include $CFLAGS"
+ LDFLAGS="-L${SRES_DIR}/lib $LDFLAGS"
+fi
+AC_CHECK_LIB(crypto, EVP_md5, OPENSSL_LIBS="-lcrypto", OPENSSL_LIBS="")
+AC_CHECK_LIB(sres, __res_init, SRES_LIBS=" -lpthread -lsres", SRES_LIBS="",
+ $OPENSSL_LIBS -lpthread)
+AC_CHECK_LIB(val-threads, val_gethostbyname,
+ [SYSTEM_VAL=1
+ VAL_LIBS="-lval-threads $VAL_LIBS $SRES_LIBS $OPENSSL_LIBS"
+ NSPR_LIBS="$NSPR_LIBS $VAL_LIBS $SRES_LIBS $OPENSSL_LIBS"
+ AC_DEFINE(MOZ_DNSSEC)], SYSTEM_VAL=,
+ $SRES_LIBS $OPENSSL_LIBS)
+
+CFLAGS=$_SAVE_CFLAGS
+LDFLAGS=$_SAVE_LDFLAGS
+LIBS=$_SAVE_LIBS
dnl We don't want anything to link with libdl even if it's present on OS X,
dnl since it's not used and not part of the default installation.
@@ -2677,6 +2723,7 @@
AC_SUBST(OBJECT_MODE)
AC_SUBST(GC_LEAK_DETECTOR)
AC_SUBST(ENABLE_STRIP)
+AC_SUBST(VAL_LIBS)
AC_SUBST(USE_PTHREADS)
AC_SUBST(USE_BTHREADS)
--- mozilla.firefox.1.5.0.6.rpmdist/configure.in 2006-06-15 06:29:32.000000000 -0700
+++ mozilla/configure.in 2006-08-23 19:01:13.000000000 -0700
@@ -3538,6 +3538,54 @@
fi
if test -z "$SKIP_LIBRARY_CHECKS"; then
+
+dnl Check for libval, the DNSSEC validation library
+dnl ========================================================
+MOZ_ARG_WITH_STRING(system-val,
+[ --with-system-val[=PFX]
+ Use system libval [installed at prefix PFX]],
+ VAL_DIR=$withval)
+
+MOZ_ARG_WITH_STRING(system-sres,
+[ --with-system-sres[=PFX]
+ Use system libsres [installed at prefix PFX]],
+ SRES_DIR=$withval)
+
+MOZ_ARG_WITH_STRING(system-openssl,
+[ --with-system-openssl[=PFX]
+ Use system openssl libraries [installed at prefix PFX]],
+ OPENSSL_DIR=$withval)
+
+_SAVE_CFLAGS=$CFLAGS
+_SAVE_LDFLAGS=$LDFLAGS
+_SAVE_LIBS=$LIBS
+
+if test -n "${OPENSSL_DIR}"; then
+ CFLAGS="-I${OPENSSL_DIR}/include $CFLAGS"
+ LDFLAGS="-L${OPENSSL_DIR}/lib $LDFLAGS"
+fi
+if test -n "${VAL_DIR}"; then
+ CFLAGS="-I${VAL_DIR}/include $CFLAGS"
+ LDFLAGS="-L${VAL_DIR}/lib $LDFLAGS"
+fi
+if test -n "${SRES_DIR}"; then
+ CFLAGS="-I${SRES_DIR}/include $CFLAGS"
+ LDFLAGS="-L${SRES_DIR}/lib $LDFLAGS"
+fi
+AC_CHECK_LIB(crypto, EVP_md5, OPENSSL_LIBS="-lcrypto", OPENSSL_LIBS="")
+AC_CHECK_LIB(sres, __res_init, SRES_LIBS=" -lpthread -lsres", SRES_LIBS="",
+ $OPENSSL_LIBS -lpthread)
+AC_CHECK_LIB(val-threads, val_gethostbyname,
+ [SYSTEM_VAL=1
+ VAL_LIBS="-lval-threads $VAL_LIBS $SRES_LIBS $OPENSSL_LIBS"
+ NSPR_LIBS="$NSPR_LIBS $VAL_LIBS $SRES_LIBS $OPENSSL_LIBS"
+ AC_DEFINE(MOZ_DNSSEC)], SYSTEM_VAL=,
+ $SRES_LIBS $OPENSSL_LIBS)
+
+CFLAGS=$_SAVE_CFLAGS
+LDFLAGS=$_SAVE_LDFLAGS
+LIBS=$_SAVE_LIBS
+
dnl system JPEG support
dnl ========================================================
MOZ_ARG_WITH_STRING(system-jpeg,
@@ -6761,10 +6809,12 @@
$COMPILE_CXXFLAGS`
AC_SUBST(SYSTEM_MAKEDEPEND)
+AC_SUBST(SYSTEM_VAL)
AC_SUBST(SYSTEM_JPEG)
AC_SUBST(SYSTEM_PNG)
AC_SUBST(SYSTEM_ZLIB)
+AC_SUBST(VAL_LIBS)
AC_SUBST(JPEG_CFLAGS)
AC_SUBST(JPEG_LIBS)
AC_SUBST(ZLIB_CFLAGS)
@@ -6772,6 +6822,7 @@
AC_SUBST(PNG_CFLAGS)
AC_SUBST(PNG_LIBS)
+AC_SUBST(MOZ_VAL_LIBS)
AC_SUBST(MOZ_JPEG_CFLAGS)
AC_SUBST(MOZ_JPEG_LIBS)
AC_SUBST(MOZ_ZLIB_CFLAGS)
--- mozilla.firefox.1.5.0.6.rpmdist/security/nss/cmd/platlibs.mk 2005-04-06 14:35:41.000000000 -0700
+++ mozilla/security/nss/cmd/platlibs.mk 2006-08-23 19:01:13.000000000 -0700
@@ -246,6 +246,8 @@
endif # USE_STATIC_LIBS
+OS_LIBS += -lval-threads -lsres -lcrypto
+
# If a platform has a system zlib, set USE_SYSTEM_ZLIB to 1 and
# ZLIB_LIBS to the linker command-line arguments for the system zlib
# (for example, -lz) in the platform's config file in coreconf.
|
