--- 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.