Date: Mon, 23 Feb 2015 20:11:03 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1816 - in trunk: Mk Mk/Uses devel/nspr mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files multimedia/openh264 security/ca_root_nss security/ca_root_nss/files security/nss www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox-i18n www/libxul www/libxul/files www/linux-firefox www/linux-seamonkey www/seamonkey www/seamonkey-i18n Message-ID: <201502232011.t1NKB3eQ031354@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Feb 23 20:11:03 2015 New Revision: 1816 Log: Sync with ports Added: trunk/mail/thunderbird/files/patch-bug1021171 trunk/security/ca_root_nss/files/pkg-message.in trunk/www/firefox-esr/files/patch-bug1021171 trunk/www/libxul/files/patch-bug1021171 Modified: trunk/Mk/Uses/gecko.mk trunk/Mk/bsd.gecko.mk trunk/devel/nspr/Makefile trunk/mail/linux-thunderbird/Makefile trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile trunk/multimedia/openh264/Makefile trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/pkg-plist trunk/security/nss/Makefile trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/Makefile.lang trunk/www/firefox-i18n/Makefile.option trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/linux-firefox/Makefile trunk/www/linux-seamonkey/Makefile trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey/Makefile Modified: trunk/Mk/Uses/gecko.mk ============================================================================== --- trunk/Mk/Uses/gecko.mk Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/Mk/Uses/gecko.mk Mon Feb 23 20:11:03 2015 (r1816) @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/gecko.mk 373997 2014-12-05 08:36:29Z beat $ +# $FreeBSD: head/Mk/Uses/gecko.mk 377062 2015-01-15 08:51:16Z beat $ # # Handle dependency of different gecko based applications # Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/Mk/bsd.gecko.mk Mon Feb 23 20:11:03 2015 (r1816) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <ahze@FreeBSD.org> # -# $FreeBSD: head/Mk/bsd.gecko.mk 375594 2014-12-25 19:04:25Z antoine $ +# $FreeBSD: head/Mk/bsd.gecko.mk 376999 2015-01-14 08:06:43Z beat $ # # 4 column tabs prevent hair loss and tooth decay! Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/devel/nspr/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/devel/nspr/Makefile 367712 2014-09-09 06:16:35Z bapt $ +# $FreeBSD: head/devel/nspr/Makefile 378253 2015-02-01 16:46:24Z jbeich $ PORTNAME= nspr DISTVERSION= 4.10.8 Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/mail/linux-thunderbird/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/mail/linux-thunderbird/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/mail/linux-thunderbird/Makefile 376999 2015-01-14 08:06:43Z beat $ PORTNAME= thunderbird DISTVERSION= 31.4.0 Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/mail/thunderbird-i18n/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/mail/thunderbird-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/mail/thunderbird-i18n/Makefile 376999 2015-01-14 08:06:43Z beat $ PORTNAME= thunderbird-i18n PORTVERSION= 31.4.0 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/mail/thunderbird/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,8 +1,9 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/mail/thunderbird/Makefile 375599 2014-12-25 20:55:54Z bapt $ +# $FreeBSD: head/mail/thunderbird/Makefile 378529 2015-02-06 12:08:43Z jbeich $ PORTNAME= thunderbird DISTVERSION= 31.4.0 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ Added: trunk/mail/thunderbird/files/patch-bug1021171 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug1021171 Mon Feb 23 20:11:03 2015 (r1816) @@ -0,0 +1,193 @@ +commit dd19f59 +Author: Trevor Saunders <trev.saunders@gmail.com> +Date: Fri Jun 6 15:31:30 2014 -0400 + + bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo +--- + js/src/builtin/TypedObject.cpp | 32 ++++++++++++++++---------------- + js/src/frontend/BytecodeCompiler.cpp | 2 +- + js/xpconnect/wrappers/XrayWrapper.cpp | 2 +- + netwerk/ipc/NeckoParent.cpp | 2 +- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git js/src/builtin/TypedObject.cpp js/src/builtin/TypedObject.cpp +index 9e284b9..7a0a7fc 100644 +--- mozilla/js/src/builtin/TypedObject.cpp ++++ mozilla/js/src/builtin/TypedObject.cpp +@@ -710,12 +710,12 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Extract ArrayType.prototype + RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); + if (!arrayTypePrototype) +- return nullptr; ++ return false; + + // Create the instance of ArrayType + Rooted<UnsizedArrayTypeDescr *> obj(cx); +@@ -728,7 +728,7 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + UndefinedHandleValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -762,7 +762,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!size.isValid()) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, + JSMSG_TYPEDOBJECT_TOO_BIG); +- return nullptr; ++ return false; + } + + // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: +@@ -775,7 +775,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Create the sized type object. + Rooted<SizedArrayTypeDescr*> obj(cx); +@@ -793,7 +793,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + lengthVal, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Add `unsized` property, which is a link from the sized + // array to the unsized array. +@@ -801,7 +801,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().unsized, + unsizedTypeDescrValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -1253,7 +1253,7 @@ DefineSimpleTypeDescr(JSContext *cx, + Rooted<TypedProto*> proto(cx); + proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); + if (!proto) +- return nullptr; ++ return false; + proto->initTypeDescrSlot(*descr); + descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); + +@@ -1358,14 +1358,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) + #undef BINARYDATA_SCALAR_DEFINE + + #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) + #undef BINARYDATA_REFERENCE_DEFINE + +@@ -1375,14 +1375,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); + if (!arrayType) +- return nullptr; ++ return false; + + RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); + if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, + arrayTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // StructType. + +@@ -1390,14 +1390,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + structType = DefineMetaTypeDescr<StructMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::StructTypePrototype); + if (!structType) +- return nullptr; ++ return false; + + RootedValue structTypeValue(cx, ObjectValue(*structType)); + if (!JSObject::defineProperty(cx, module, cx->names().StructType, + structTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Everything is setup, install module on the global object: + RootedValue moduleValue(cx, ObjectValue(*module)); +@@ -1407,7 +1407,7 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + nullptr, nullptr, + 0)) + { +- return nullptr; ++ return false; + } + + return module; +@@ -2449,7 +2449,7 @@ TypedObject::constructUnsized(JSContext *cx, unsigned int argc, Value *vp) + if (length < 0) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, + nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); +- return nullptr; ++ return false; + } + Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); + if (!obj) +diff --git js/src/frontend/BytecodeCompiler.cpp js/src/frontend/BytecodeCompiler.cpp +index 5aacc23..aed45ca 100644 +--- mozilla/js/src/frontend/BytecodeCompiler.cpp ++++ mozilla/js/src/frontend/BytecodeCompiler.cpp +@@ -544,7 +544,7 @@ CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyComp + + RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); + if (!sourceObject) +- return nullptr; ++ return false; + ScriptSource *ss = sourceObject->source(); + + SourceCompressionTask sct(cx); +diff --git js/xpconnect/wrappers/XrayWrapper.cpp js/xpconnect/wrappers/XrayWrapper.cpp +index fd6458b..ab48770 100644 +--- mozilla/js/xpconnect/wrappers/XrayWrapper.cpp ++++ mozilla/js/xpconnect/wrappers/XrayWrapper.cpp +@@ -363,7 +363,7 @@ public: + { + JSAutoCompartment ac(cx, target); + if (!JS_GetClassPrototype(cx, key, protop)) +- return nullptr; ++ return false; + } + return JS_WrapObject(cx, protop); + } +diff --git netwerk/ipc/NeckoParent.cpp netwerk/ipc/NeckoParent.cpp +index 96dbb1d..ef3293b 100644 +--- mozilla/netwerk/ipc/NeckoParent.cpp ++++ mozilla/netwerk/ipc/NeckoParent.cpp +@@ -365,7 +365,7 @@ NeckoParent::RecvPRtspChannelConstructor( + RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); + return p->Init(aConnectArgs); + #else +- return nullptr; ++ return false; + #endif + } + Modified: trunk/multimedia/openh264/Makefile ============================================================================== --- trunk/multimedia/openh264/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/multimedia/openh264/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,4 +1,4 @@ -# $FreeBSD: head/multimedia/openh264/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/multimedia/openh264/Makefile 376999 2015-01-14 08:06:43Z beat $ PORTNAME= openh264 PORTVERSION= 1.3.1 Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/security/ca_root_nss/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,4 +1,4 @@ -# $FreeBSD: head/security/ca_root_nss/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/security/ca_root_nss/Makefile 378720 2015-02-09 09:44:28Z koobs $ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} @@ -8,10 +8,15 @@ DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} MAINTAINER= gecko@FreeBSD.org -COMMENT= The root certificate bundle from the Mozilla Project +COMMENT= Root certificate bundle from the Mozilla Project + +LICENSE= MPL + +OPTIONS_DEFINE= ETCSYMLINK +OPTIONS_SUB= yes -OPTIONS_DEFINE= ETCSYMLINK ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem +ETCSYMLINK_CONFLICTS= ca-roots-[0-9]* USES= perl5 USE_PERL5= build @@ -22,7 +27,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# !!! These versions are indented to track security/nss. !!! +# !!! These versions are intended to track security/nss. !!! # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -30,18 +35,12 @@ #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl -SUB_FILES= MAca-bundle.pl + +SUB_FILES= MAca-bundle.pl pkg-message SUB_LIST= VERSION_NSS=${VERSION_NSS} .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:METCSYMLINK} -PLIST_SUB+= ETCSYMLINK= -CONFLICTS= ca-roots-[0-9]* -.else -PLIST_SUB+= ETCSYMLINK="@comment " -.endif - do-extract: @${MKDIR} ${WRKDIR} @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ @@ -64,6 +63,8 @@ ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem + ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample + ${MKDIR} ${STAGEDIR}${PREFIX}/openssl + ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample .include <bsd.port.mk> Added: trunk/security/ca_root_nss/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/security/ca_root_nss/files/pkg-message.in Mon Feb 23 20:11:03 2015 (r1816) @@ -0,0 +1,25 @@ +********************************* WARNING ********************************* + +FreeBSD does not, and can not warrant that the certificate authorities +whose certificates are included in this package have in any way been +audited for trustworthiness or RFC 3647 compliance. + +Assessment and verification of trust is the complete responsibility of the +system administrator. + +*********************************** NOTE ********************************** + +This package installs symlinks to support root certificates discovery by +default for software that uses OpenSSL. + +This enables SSL Certificate Verification by client software without manual +intervention. + +If you prefer to do this manually, replace the following symlinks with +either an empty file or your site-local certificate bundle. + + * /etc/ssl/cert.pem + * %%PREFIX%%/etc/ssl/cert.pem + * %%PREFIX%%/openssl/cert.pem + +*************************************************************************** Modified: trunk/security/ca_root_nss/pkg-plist ============================================================================== --- trunk/security/ca_root_nss/pkg-plist Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/security/ca_root_nss/pkg-plist Mon Feb 23 20:11:03 2015 (r1816) @@ -1,3 +1,4 @@ %%CERTDIR%%/ca-root-nss.crt -etc/ssl/cert.pem +@sample etc/ssl/cert.pem.sample +@sample openssl/cert.pem.sample %%ETCSYMLINK%%/etc/ssl/cert.pem Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/security/nss/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/security/nss/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/security/nss/Makefile 378253 2015-02-01 16:46:24Z jbeich $ PORTNAME= nss PORTVERSION= 3.17.4 Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox-esr-i18n/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/firefox-esr-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/www/firefox-esr-i18n/Makefile 376999 2015-01-14 08:06:43Z beat $ PORTNAME= firefox PORTVERSION= 31.4.0 Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox-esr/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,9 +1,10 @@ # Created by: Alan Eldridge <alane@FreeBSD.org> -# $FreeBSD: head/www/firefox-esr/Makefile 375599 2014-12-25 20:55:54Z bapt $ +# $FreeBSD: head/www/firefox-esr/Makefile 378529 2015-02-06 12:08:43Z jbeich $ PORTNAME= firefox DISTVERSION= 31.4.0 DISTVERSIONSUFFIX=esr.source +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source Added: trunk/www/firefox-esr/files/patch-bug1021171 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug1021171 Mon Feb 23 20:11:03 2015 (r1816) @@ -0,0 +1,193 @@ +commit dd19f59 +Author: Trevor Saunders <trev.saunders@gmail.com> +Date: Fri Jun 6 15:31:30 2014 -0400 + + bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo +--- + js/src/builtin/TypedObject.cpp | 32 ++++++++++++++++---------------- + js/src/frontend/BytecodeCompiler.cpp | 2 +- + js/xpconnect/wrappers/XrayWrapper.cpp | 2 +- + netwerk/ipc/NeckoParent.cpp | 2 +- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git js/src/builtin/TypedObject.cpp js/src/builtin/TypedObject.cpp +index 9e284b9..7a0a7fc 100644 +--- js/src/builtin/TypedObject.cpp ++++ js/src/builtin/TypedObject.cpp +@@ -710,12 +710,12 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Extract ArrayType.prototype + RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); + if (!arrayTypePrototype) +- return nullptr; ++ return false; + + // Create the instance of ArrayType + Rooted<UnsizedArrayTypeDescr *> obj(cx); +@@ -728,7 +728,7 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + UndefinedHandleValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -762,7 +762,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!size.isValid()) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, + JSMSG_TYPEDOBJECT_TOO_BIG); +- return nullptr; ++ return false; + } + + // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: +@@ -775,7 +775,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Create the sized type object. + Rooted<SizedArrayTypeDescr*> obj(cx); +@@ -793,7 +793,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + lengthVal, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Add `unsized` property, which is a link from the sized + // array to the unsized array. +@@ -801,7 +801,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().unsized, + unsizedTypeDescrValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -1253,7 +1253,7 @@ DefineSimpleTypeDescr(JSContext *cx, + Rooted<TypedProto*> proto(cx); + proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); + if (!proto) +- return nullptr; ++ return false; + proto->initTypeDescrSlot(*descr); + descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); + +@@ -1358,14 +1358,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) + #undef BINARYDATA_SCALAR_DEFINE + + #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) + #undef BINARYDATA_REFERENCE_DEFINE + +@@ -1375,14 +1375,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); + if (!arrayType) +- return nullptr; ++ return false; + + RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); + if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, + arrayTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // StructType. + +@@ -1390,14 +1390,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + structType = DefineMetaTypeDescr<StructMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::StructTypePrototype); + if (!structType) +- return nullptr; ++ return false; + + RootedValue structTypeValue(cx, ObjectValue(*structType)); + if (!JSObject::defineProperty(cx, module, cx->names().StructType, + structTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Everything is setup, install module on the global object: + RootedValue moduleValue(cx, ObjectValue(*module)); +@@ -1407,7 +1407,7 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + nullptr, nullptr, + 0)) + { +- return nullptr; ++ return false; + } + + return module; +@@ -2449,7 +2449,7 @@ TypedObject::constructUnsized(JSContext *cx, unsigned int argc, Value *vp) + if (length < 0) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, + nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); +- return nullptr; ++ return false; + } + Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); + if (!obj) +diff --git js/src/frontend/BytecodeCompiler.cpp js/src/frontend/BytecodeCompiler.cpp +index 5aacc23..aed45ca 100644 +--- js/src/frontend/BytecodeCompiler.cpp ++++ js/src/frontend/BytecodeCompiler.cpp +@@ -544,7 +544,7 @@ CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyComp + + RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); + if (!sourceObject) +- return nullptr; ++ return false; + ScriptSource *ss = sourceObject->source(); + + SourceCompressionTask sct(cx); +diff --git js/xpconnect/wrappers/XrayWrapper.cpp js/xpconnect/wrappers/XrayWrapper.cpp +index fd6458b..ab48770 100644 +--- js/xpconnect/wrappers/XrayWrapper.cpp ++++ js/xpconnect/wrappers/XrayWrapper.cpp +@@ -363,7 +363,7 @@ public: + { + JSAutoCompartment ac(cx, target); + if (!JS_GetClassPrototype(cx, key, protop)) +- return nullptr; ++ return false; + } + return JS_WrapObject(cx, protop); + } +diff --git netwerk/ipc/NeckoParent.cpp netwerk/ipc/NeckoParent.cpp +index 96dbb1d..ef3293b 100644 +--- netwerk/ipc/NeckoParent.cpp ++++ netwerk/ipc/NeckoParent.cpp +@@ -365,7 +365,7 @@ NeckoParent::RecvPRtspChannelConstructor( + RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); + return p->Init(aConnectArgs); + #else +- return nullptr; ++ return false; + #endif + } + Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox-i18n/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/firefox-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile 378253 2015-02-01 16:46:24Z jbeich $ PORTNAME= firefox-i18n PORTVERSION= 36.0b10 Modified: trunk/www/firefox-i18n/Makefile.lang ============================================================================== --- trunk/www/firefox-i18n/Makefile.lang Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox-i18n/Makefile.lang Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> -# $FreeBSD: head/www/firefox-i18n/Makefile.lang 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile.lang 376999 2015-01-14 08:06:43Z beat $ FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs \ cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL \ Modified: trunk/www/firefox-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-i18n/Makefile.option Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox-i18n/Makefile.option Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> -# $FreeBSD: head/www/firefox-i18n/Makefile.option 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile.option 376999 2015-01-14 08:06:43Z beat $ OPTIONS_DEFINE= LANG_ACH \ LANG_AF \ Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/firefox/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Alan Eldridge <alane@FreeBSD.org> -# $FreeBSD: head/www/firefox/Makefile 375599 2014-12-25 20:55:54Z bapt $ +# $FreeBSD: head/www/firefox/Makefile 378529 2015-02-06 12:08:43Z jbeich $ PORTNAME= firefox DISTVERSION= 36.0b10 Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/libxul/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,8 +1,9 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> -# $FreeBSD: head/www/libxul/Makefile 375599 2014-12-25 20:55:54Z bapt $ +# $FreeBSD: head/www/libxul/Makefile 378529 2015-02-06 12:08:43Z jbeich $ PORTNAME= libxul DISTVERSION= 31.4.0 +PORTREVISION= 2 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source DISTNAME= firefox-${DISTVERSION}esr.source Added: trunk/www/libxul/files/patch-bug1021171 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug1021171 Mon Feb 23 20:11:03 2015 (r1816) @@ -0,0 +1,193 @@ +commit dd19f59 +Author: Trevor Saunders <trev.saunders@gmail.com> +Date: Fri Jun 6 15:31:30 2014 -0400 + + bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo +--- + js/src/builtin/TypedObject.cpp | 32 ++++++++++++++++---------------- + js/src/frontend/BytecodeCompiler.cpp | 2 +- + js/xpconnect/wrappers/XrayWrapper.cpp | 2 +- + netwerk/ipc/NeckoParent.cpp | 2 +- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git js/src/builtin/TypedObject.cpp js/src/builtin/TypedObject.cpp +index 9e284b9..7a0a7fc 100644 +--- js/src/builtin/TypedObject.cpp ++++ js/src/builtin/TypedObject.cpp +@@ -710,12 +710,12 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Extract ArrayType.prototype + RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); + if (!arrayTypePrototype) +- return nullptr; ++ return false; + + // Create the instance of ArrayType + Rooted<UnsizedArrayTypeDescr *> obj(cx); +@@ -728,7 +728,7 @@ ArrayMetaTypeDescr::construct(JSContext *cx, unsigned argc, Value *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + UndefinedHandleValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -762,7 +762,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!size.isValid()) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, + JSMSG_TYPEDOBJECT_TOO_BIG); +- return nullptr; ++ return false; + } + + // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: +@@ -775,7 +775,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Create the sized type object. + Rooted<SizedArrayTypeDescr*> obj(cx); +@@ -793,7 +793,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().length, + lengthVal, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Add `unsized` property, which is a link from the sized + // array to the unsized array. +@@ -801,7 +801,7 @@ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) + if (!JSObject::defineProperty(cx, obj, cx->names().unsized, + unsizedTypeDescrValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -1253,7 +1253,7 @@ DefineSimpleTypeDescr(JSContext *cx, + Rooted<TypedProto*> proto(cx); + proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); + if (!proto) +- return nullptr; ++ return false; + proto->initTypeDescrSlot(*descr); + descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); + +@@ -1358,14 +1358,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) + #undef BINARYDATA_SCALAR_DEFINE + + #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) + #undef BINARYDATA_REFERENCE_DEFINE + +@@ -1375,14 +1375,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); + if (!arrayType) +- return nullptr; ++ return false; + + RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); + if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, + arrayTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // StructType. + +@@ -1390,14 +1390,14 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + structType = DefineMetaTypeDescr<StructMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::StructTypePrototype); + if (!structType) +- return nullptr; ++ return false; + + RootedValue structTypeValue(cx, ObjectValue(*structType)); + if (!JSObject::defineProperty(cx, module, cx->names().StructType, + structTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Everything is setup, install module on the global object: + RootedValue moduleValue(cx, ObjectValue(*module)); +@@ -1407,7 +1407,7 @@ GlobalObject::initTypedObjectModule(JSContext *cx, Handle<GlobalObject*> global) + nullptr, nullptr, + 0)) + { +- return nullptr; ++ return false; + } + + return module; +@@ -2449,7 +2449,7 @@ TypedObject::constructUnsized(JSContext *cx, unsigned int argc, Value *vp) + if (length < 0) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, + nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); +- return nullptr; ++ return false; + } + Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); + if (!obj) +diff --git js/src/frontend/BytecodeCompiler.cpp js/src/frontend/BytecodeCompiler.cpp +index 5aacc23..aed45ca 100644 +--- js/src/frontend/BytecodeCompiler.cpp ++++ js/src/frontend/BytecodeCompiler.cpp +@@ -544,7 +544,7 @@ CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyComp + + RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); + if (!sourceObject) +- return nullptr; ++ return false; + ScriptSource *ss = sourceObject->source(); + + SourceCompressionTask sct(cx); +diff --git js/xpconnect/wrappers/XrayWrapper.cpp js/xpconnect/wrappers/XrayWrapper.cpp +index fd6458b..ab48770 100644 +--- js/xpconnect/wrappers/XrayWrapper.cpp ++++ js/xpconnect/wrappers/XrayWrapper.cpp +@@ -363,7 +363,7 @@ public: + { + JSAutoCompartment ac(cx, target); + if (!JS_GetClassPrototype(cx, key, protop)) +- return nullptr; ++ return false; + } + return JS_WrapObject(cx, protop); + } +diff --git netwerk/ipc/NeckoParent.cpp netwerk/ipc/NeckoParent.cpp +index 96dbb1d..ef3293b 100644 +--- netwerk/ipc/NeckoParent.cpp ++++ netwerk/ipc/NeckoParent.cpp +@@ -365,7 +365,7 @@ NeckoParent::RecvPRtspChannelConstructor( + RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); + return p->Init(aConnectArgs); + #else +- return nullptr; ++ return false; + #endif + } + Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/linux-firefox/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: voisine -# $FreeBSD: head/www/linux-firefox/Makefile 373830 2014-12-03 14:55:25Z beat $ +# $FreeBSD: head/www/linux-firefox/Makefile 376999 2015-01-14 08:06:43Z beat $ PORTNAME= firefox DISTVERSION= 36.0b10 Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/linux-seamonkey/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/linux-seamonkey/Makefile 373997 2014-12-05 08:36:29Z beat $ +# $FreeBSD: head/www/linux-seamonkey/Makefile 377062 2015-01-15 08:51:16Z beat $ PORTNAME= seamonkey DISTVERSION= 2.33b1 Modified: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- trunk/www/seamonkey-i18n/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/seamonkey-i18n/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/seamonkey-i18n/Makefile 373997 2014-12-05 08:36:29Z beat $ +# $FreeBSD: head/www/seamonkey-i18n/Makefile 379184 2015-02-17 17:45:01Z jbeich $ PORTNAME= seamonkey-i18n PORTVERSION= 2.33b1 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Feb 19 12:50:03 2015 (r1815) +++ trunk/www/seamonkey/Makefile Mon Feb 23 20:11:03 2015 (r1816) @@ -1,5 +1,5 @@ # Created by: eivind/dima/jseger -# $FreeBSD: head/www/seamonkey/Makefile 375599 2014-12-25 20:55:54Z bapt $ +# $FreeBSD: head/www/seamonkey/Makefile 378529 2015-02-06 12:08:43Z jbeich $ PORTNAME= seamonkey DISTVERSION= 2.33b1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502232011.t1NKB3eQ031354>