From ea31ad0ed5501d0bf92267c35beaf06ac016bad2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 May 2018 16:38:56 +0100 Subject: gentoo resync : 13.05.2018 --- dev-libs/nss/Manifest | 1 - .../files/nss-3.35-Hacl_Poly1305_64-aarch64.patch | 36 ---------------------- 2 files changed, 37 deletions(-) delete mode 100644 dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch (limited to 'dev-libs/nss') diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index c0103ae1c632..41c8f722f90d 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -3,7 +3,6 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03 -AUX nss-3.35-Hacl_Poly1305_64-aarch64.patch 1131 BLAKE2B b2d9513a71011e7498a01be654c2b43ebf466158c1cc9cbcc9d5f01a48c94023a8175285c312c228131517de28bb82f436b91f332ddf3911a2a2505790aa658e SHA512 2cdcfbc223e29fb9b68237ebd7112c8121b597bd6ba77ba19045afb771dce148a39b4acc2038e17f61268462dfa9852c007d110430b5eb759f3d7ac7f0700be8 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65 DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103 diff --git a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch deleted file mode 100644 index c05d103e25ba..000000000000 --- a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# HG changeset patch -# User Daiki Ueno -# Date 1516710574 -3600 -# Node ID 74e679158d1bfe05c173e995ae7dc5a05ae02fe0 -# Parent b3feffd76f4714139f72369f82b28619a704dbd6 -Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer - -diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile ---- a/lib/freebl/Makefile -+++ b/lib/freebl/Makefile -@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY - - ifneq (1,$(CC_IS_GCC)) - EXTRA_SRCS += chacha20.c - VERIFIED_SRCS += Hacl_Chacha20.c - else - EXTRA_SRCS += chacha20_vec.c - endif - else -- EXTRA_SRCS += poly1305.c -+ ifeq ($(CPU_ARCH),aarch64) -+ EXTRA_SRCS += Hacl_Poly1305_64.c -+ else -+ EXTRA_SRCS += poly1305.c -+ endif -+ - EXTRA_SRCS += chacha20.c - VERIFIED_SRCS += Hacl_Chacha20.c - endif # x86_64 - 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). - -- cgit v1.2.3