Index: branches/2020Q2/mail/thunderbird/Makefile =================================================================== --- branches/2020Q2/mail/thunderbird/Makefile (revision 534914) +++ branches/2020Q2/mail/thunderbird/Makefile (revision 534915) @@ -1,76 +1,76 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird DISTVERSION= 68.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.21:devel/nspr \ nss>=3.44.3:security/nss \ icu>=63.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.4.0:print/harfbuzz \ graphite2>=1.3.13:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.28.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ zip:archivers/zip SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -vpx USES= tar:xz MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/comm/mail/app/nsMailApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include Index: branches/2020Q2/mail/thunderbird/files/patch-bug1624128 =================================================================== --- branches/2020Q2/mail/thunderbird/files/patch-bug1624128 (nonexistent) +++ branches/2020Q2/mail/thunderbird/files/patch-bug1624128 (revision 534915) @@ -0,0 +1,70 @@ +commit 2a981b96abf3 +Author: Kevin Jacobs +Date: Tue Apr 14 18:32:19 2020 +0000 + + Bug 1624128 - Update CK_GCM_PARAMS uses for PKCS11 v3.0 definition r=keeler + + This patch initializes the ulIvBits member of CK_GCM_PARAMS, which is new in PKCS11 v3. + + For libprio, we instead define NSS_PKCS11_2_0_COMPAT, which yields the old struct definition. + + Differential Revision: https://phabricator.services.mozilla.com/D67740 + + --HG-- + extra : moz-landing-system : lando +--- + dom/crypto/WebCryptoTask.cpp | 1 + + netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c | 1 + + security/manager/ssl/OSKeyStore.cpp | 1 + + third_party/prio/moz.build | 5 +++++ + 4 files changed, 8 insertions(+) + +diff --git dom/crypto/WebCryptoTask.cpp dom/crypto/WebCryptoTask.cpp +index ad0d1432738f0..60a265972d212 100644 +--- dom/crypto/WebCryptoTask.cpp ++++ dom/crypto/WebCryptoTask.cpp +@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData { + case CKM_AES_GCM: + gcmParams.pIv = mIv.Elements(); + gcmParams.ulIvLen = mIv.Length(); ++ gcmParams.ulIvBits = gcmParams.ulIvLen * 8; + gcmParams.pAAD = mAad.Elements(); + gcmParams.ulAADLen = mAad.Length(); + gcmParams.ulTagBits = mTagLength; +diff --git netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +index e1fdbe36fbf85..2be2ce932ddf1 100644 +--- netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c ++++ netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, + + c->params.pIv = c->iv; + c->params.ulIvLen = GCM_IV_LEN; ++ c->params.ulIvBits = GCM_IV_LEN * 8; + c->params.pAAD = c->aad; + c->params.ulAADLen = c->aad_size; + +diff --git security/manager/ssl/OSKeyStore.cpp security/manager/ssl/OSKeyStore.cpp +index 00bc918c5fdd7..c83a559d9c1ea 100644 +--- security/manager/ssl/OSKeyStore.cpp ++++ security/manager/ssl/OSKeyStore.cpp +@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11SymKey& aSymKey, + CK_GCM_PARAMS gcm_params; + gcm_params.pIv = const_cast(ivp); + gcm_params.ulIvLen = mIVLength; ++ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; + gcm_params.ulTagBits = 128; + gcm_params.pAAD = nullptr; + gcm_params.ulAADLen = 0; +diff --git third_party/prio/moz.build third_party/prio/moz.build +index 3e10fe71ce8ed..0a6e3c74a2696 100644 +--- third_party/prio/moz.build ++++ third_party/prio/moz.build +@@ -42,3 +42,8 @@ SOURCES += [ + ] + + FINAL_LIBRARY = 'xul' ++ ++# Use PKCS11 v2 struct definitions for now, otherwise NSS requires ++# CK_GCM_PARAMS.ulIvBits to be set. This workaround is only required ++# until NSS 3.52 RTM and upstream correctly initializes the field. ++DEFINES['NSS_PKCS11_2_0_COMPAT'] = True Property changes on: branches/2020Q2/mail/thunderbird/files/patch-bug1624128 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2/www/firefox/Makefile =================================================================== --- branches/2020Q2/www/firefox/Makefile (revision 534914) +++ branches/2020Q2/www/firefox/Makefile (revision 534915) @@ -1,60 +1,61 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 76.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.25:devel/nspr \ nss>=3.51.1:security/nss \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.4:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -sqlite USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2020Q2/www/firefox/files/patch-bug1624128 =================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1624128 (nonexistent) +++ branches/2020Q2/www/firefox/files/patch-bug1624128 (revision 534915) @@ -0,0 +1,70 @@ +commit 2a981b96abf3 +Author: Kevin Jacobs +Date: Tue Apr 14 18:32:19 2020 +0000 + + Bug 1624128 - Update CK_GCM_PARAMS uses for PKCS11 v3.0 definition r=keeler + + This patch initializes the ulIvBits member of CK_GCM_PARAMS, which is new in PKCS11 v3. + + For libprio, we instead define NSS_PKCS11_2_0_COMPAT, which yields the old struct definition. + + Differential Revision: https://phabricator.services.mozilla.com/D67740 + + --HG-- + extra : moz-landing-system : lando +--- + dom/crypto/WebCryptoTask.cpp | 1 + + netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c | 1 + + security/manager/ssl/OSKeyStore.cpp | 1 + + third_party/prio/moz.build | 5 +++++ + 4 files changed, 8 insertions(+) + +diff --git dom/crypto/WebCryptoTask.cpp dom/crypto/WebCryptoTask.cpp +index ad0d1432738f0..60a265972d212 100644 +--- dom/crypto/WebCryptoTask.cpp ++++ dom/crypto/WebCryptoTask.cpp +@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData { + case CKM_AES_GCM: + gcmParams.pIv = mIv.Elements(); + gcmParams.ulIvLen = mIv.Length(); ++ gcmParams.ulIvBits = gcmParams.ulIvLen * 8; + gcmParams.pAAD = mAad.Elements(); + gcmParams.ulAADLen = mAad.Length(); + gcmParams.ulTagBits = mTagLength; +diff --git netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +index e1fdbe36fbf85..2be2ce932ddf1 100644 +--- netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c ++++ netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, + + c->params.pIv = c->iv; + c->params.ulIvLen = GCM_IV_LEN; ++ c->params.ulIvBits = GCM_IV_LEN * 8; + c->params.pAAD = c->aad; + c->params.ulAADLen = c->aad_size; + +diff --git security/manager/ssl/OSKeyStore.cpp security/manager/ssl/OSKeyStore.cpp +index 00bc918c5fdd7..c83a559d9c1ea 100644 +--- security/manager/ssl/OSKeyStore.cpp ++++ security/manager/ssl/OSKeyStore.cpp +@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11SymKey& aSymKey, + CK_GCM_PARAMS gcm_params; + gcm_params.pIv = const_cast(ivp); + gcm_params.ulIvLen = mIVLength; ++ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; + gcm_params.ulTagBits = 128; + gcm_params.pAAD = nullptr; + gcm_params.ulAADLen = 0; +diff --git third_party/prio/moz.build third_party/prio/moz.build +index 3e10fe71ce8ed..0a6e3c74a2696 100644 +--- third_party/prio/moz.build ++++ third_party/prio/moz.build +@@ -42,3 +42,8 @@ SOURCES += [ + ] + + FINAL_LIBRARY = 'xul' ++ ++# Use PKCS11 v2 struct definitions for now, otherwise NSS requires ++# CK_GCM_PARAMS.ulIvBits to be set. This workaround is only required ++# until NSS 3.52 RTM and upstream correctly initializes the field. ++DEFINES['NSS_PKCS11_2_0_COMPAT'] = True Property changes on: branches/2020Q2/www/firefox/files/patch-bug1624128 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2/www/firefox-esr/Makefile =================================================================== --- branches/2020Q2/www/firefox-esr/Makefile (revision 534914) +++ branches/2020Q2/www/firefox-esr/Makefile (revision 534915) @@ -1,61 +1,62 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 68.8.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.21:devel/nspr \ nss>=3.44.3:security/nss \ icu>=63.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.4.0:print/harfbuzz \ graphite2>=1.3.13:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.28.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ zip:archivers/zip USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox USE_MOZILLA= -vpx USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2020Q2/www/firefox-esr/files/patch-bug1624128 =================================================================== --- branches/2020Q2/www/firefox-esr/files/patch-bug1624128 (nonexistent) +++ branches/2020Q2/www/firefox-esr/files/patch-bug1624128 (revision 534915) @@ -0,0 +1,70 @@ +commit 2a981b96abf3 +Author: Kevin Jacobs +Date: Tue Apr 14 18:32:19 2020 +0000 + + Bug 1624128 - Update CK_GCM_PARAMS uses for PKCS11 v3.0 definition r=keeler + + This patch initializes the ulIvBits member of CK_GCM_PARAMS, which is new in PKCS11 v3. + + For libprio, we instead define NSS_PKCS11_2_0_COMPAT, which yields the old struct definition. + + Differential Revision: https://phabricator.services.mozilla.com/D67740 + + --HG-- + extra : moz-landing-system : lando +--- + dom/crypto/WebCryptoTask.cpp | 1 + + netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c | 1 + + security/manager/ssl/OSKeyStore.cpp | 1 + + third_party/prio/moz.build | 5 +++++ + 4 files changed, 8 insertions(+) + +diff --git dom/crypto/WebCryptoTask.cpp dom/crypto/WebCryptoTask.cpp +index ad0d1432738f0..60a265972d212 100644 +--- dom/crypto/WebCryptoTask.cpp ++++ dom/crypto/WebCryptoTask.cpp +@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData { + case CKM_AES_GCM: + gcmParams.pIv = mIv.Elements(); + gcmParams.ulIvLen = mIv.Length(); ++ gcmParams.ulIvBits = gcmParams.ulIvLen * 8; + gcmParams.pAAD = mAad.Elements(); + gcmParams.ulAADLen = mAad.Length(); + gcmParams.ulTagBits = mTagLength; +diff --git netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +index e1fdbe36fbf85..2be2ce932ddf1 100644 +--- netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c ++++ netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, + + c->params.pIv = c->iv; + c->params.ulIvLen = GCM_IV_LEN; ++ c->params.ulIvBits = GCM_IV_LEN * 8; + c->params.pAAD = c->aad; + c->params.ulAADLen = c->aad_size; + +diff --git security/manager/ssl/OSKeyStore.cpp security/manager/ssl/OSKeyStore.cpp +index 00bc918c5fdd7..c83a559d9c1ea 100644 +--- security/manager/ssl/OSKeyStore.cpp ++++ security/manager/ssl/OSKeyStore.cpp +@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11SymKey& aSymKey, + CK_GCM_PARAMS gcm_params; + gcm_params.pIv = const_cast(ivp); + gcm_params.ulIvLen = mIVLength; ++ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; + gcm_params.ulTagBits = 128; + gcm_params.pAAD = nullptr; + gcm_params.ulAADLen = 0; +diff --git third_party/prio/moz.build third_party/prio/moz.build +index 3e10fe71ce8ed..0a6e3c74a2696 100644 +--- third_party/prio/moz.build ++++ third_party/prio/moz.build +@@ -42,3 +42,8 @@ SOURCES += [ + ] + + FINAL_LIBRARY = 'xul' ++ ++# Use PKCS11 v2 struct definitions for now, otherwise NSS requires ++# CK_GCM_PARAMS.ulIvBits to be set. This workaround is only required ++# until NSS 3.52 RTM and upstream correctly initializes the field. ++DEFINES['NSS_PKCS11_2_0_COMPAT'] = True Property changes on: branches/2020Q2/www/firefox-esr/files/patch-bug1624128 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2 =================================================================== --- branches/2020Q2 (revision 534914) +++ branches/2020Q2 (revision 534915) Property changes on: branches/2020Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r534912,534914