From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08E6E138334 for ; Tue, 5 Jun 2018 13:24:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C64AFE09E1; Tue, 5 Jun 2018 13:24:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A525E09E1 for ; Tue, 5 Jun 2018 13:24:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66818335C85 for ; Tue, 5 Jun 2018 13:24:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F954296 for ; Tue, 5 Jun 2018 13:24:47 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1528205046.28242c53c6a37592f7747f8ec5b84b6cd1090a59.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch dev-libs/nss/nss-3.37.1.ebuild dev-libs/nss/nss-3.37.ebuild X-VCS-Directories: dev-libs/nss/ dev-libs/nss/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 28242c53c6a37592f7747f8ec5b84b6cd1090a59 X-VCS-Branch: master Date: Tue, 5 Jun 2018 13:24:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b70dfd8f-32b4-4da0-82d9-81362b9cab17 X-Archives-Hash: 5399acc1114d69c12cc03fe1c47e6ac7 commit: 28242c53c6a37592f7747f8ec5b84b6cd1090a59 Author: Jory A. Pratt gentoo org> AuthorDate: Tue Jun 5 13:24:06 2018 +0000 Commit: Jory Pratt gentoo org> CommitDate: Tue Jun 5 13:24:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=28242c53 dev-libs/nss: sync changes from tree dev-libs/nss/Manifest | 21 +------------ .../files/nss-3.37-fix-fstar-missing-symbols.patch | 34 ++++++++++++++++++++++ .../nss/{nss-3.37.ebuild => nss-3.37.1.ebuild} | 1 + 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 5eb73ce..9060fc6 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,22 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103 +DIST nss-3.37.1.tar.gz 23034142 BLAKE2B dd196606bf922a58c2d1f7443c6b8c570d5c5c5437f51b8c6c4ddfe84aad7d576cff46f2eba23e4d32f41984fb6ea8aaa29a63b2f010b6807df74ee71144b11d SHA512 61b8186f45afa5fade6f45737d60a86f519c8b5535963f4cc6f13fa6694be0723cdd8b0ed48bbc2eae621dfbfd80ccc249998eeb89ed565797ac4553895a01a1 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAlsD1dwACgkQVx3S0DQ8 -YDlyPBAAsNM/ndo3Scw0cG3aVzSAf47GTa+Tm9PEadwKjaznm0t8cPS8yL143fPb -HiK2Tu3DguXAJOqxEPWPUiSbLTEZxA6nJes9rl3ez4cnroqxPM0h0VXIR1oNvla2 -waF9Q76aXVm6yyt8gC+1xQocieUPDzLQxA56hcDNse8w/qSoQgT8jR/LSoTUp5mk -Knm72/l7qTjXSmuHTgktViz8k9eKXn8DlKVScf5AfxqkaEw5/0yTo4IYnZpxmacc -9LMHBBbmmJnUvWnQVItyaBXN1Xi+rcYRUy3KuSuVSqBXzQCx+QuZCwon2xQ6iEYn -jV+5hQOyDa7AD3G44JlTLix3iDKdcgh/17cIue7zS9z3YnDvzC1nL/PLcBnBA/6x -apBNdZktK4BOujfKA8R1fvmJkc7FIsuK6zzOPDTq3rM3TfWFJtGikJvgviGIQ1Oj -uOnBCo+Yq0LTzaMm7PKguyavPDmlJS8CPaS3djf68JoIy+5GZoEw0uYR9qjkt0Gh -5JOUCMe00wVVkk7SK0ipZwouSYKW9tilMur932l7j3kMh5PfCxx10cf3ubm4Xb/v -91iXqx1GBAO8s4zO9S052EJJqIaKesaU6EEG8HAUjHhGPrVM99Gcvd3Dv3jBWpL4 -OVhKKsOrB3PpczgL8lTGxFxUVcGF04j6/O9TdPGPsCmkyAtmebg= -=GjQo ------END PGP SIGNATURE----- diff --git a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch new file mode 100644 index 0000000..4a6be4e --- /dev/null +++ b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Jan Beich +# Date 1525728934 0 +# Node ID 259444458a1a7f2ce1813ebe88d924173d5daf0c +# Parent 5db9e969c74a2a02c4b1d918792827014d1a9d5e +Bug 1459739 - Build FStar.o on 32-bit ARM even with make. r=fkiefer + + +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +--- a/lib/freebl/Makefile ++++ b/lib/freebl/Makefile +@@ -534,16 +534,19 @@ endif # NSS_DISABLE_CHACHAPOLY + ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) + # All intel architectures get the 64 bit version + # With custom uint128 if necessary (faster than generic 32 bit version). + ECL_SRCS += curve25519_64.c + VERIFIED_SRCS += Hacl_Curve25519.c FStar.c + else + # All non intel architectures get the generic 32 bit implementation (slow!) + ECL_SRCS += curve25519_32.c ++ifndef NSS_DISABLE_CHACHAPOLY ++ VERIFIED_SRCS += FStar.c ++endif + endif + + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # + ####################################################################### + + include $(CORE_DEPTH)/coreconf/rules.mk + + + + diff --git a/dev-libs/nss/nss-3.37.ebuild b/dev-libs/nss/nss-3.37.1.ebuild similarity index 99% rename from dev-libs/nss/nss-3.37.ebuild rename to dev-libs/nss/nss-3.37.1.ebuild index 3a343d2..15bc70a 100644 --- a/dev-libs/nss/nss-3.37.ebuild +++ b/dev-libs/nss/nss-3.37.1.ebuild @@ -43,6 +43,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" + "${FILESDIR}/${PN}-3.37-fix-fstar-missing-symbols.patch" ) src_unpack() {