From d27ef07efb6d6b66baa275f02ab80428a6a85fa4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 14 Aug 2018 09:23:37 +1000 Subject: [PATCH] nss: fix provides, fix build for x64 --- dev-libs/nss/nss-3.38.recipe | 6 +++- dev-libs/nss/patches/nss-3.38.patchset | 39 +++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dev-libs/nss/nss-3.38.recipe b/dev-libs/nss/nss-3.38.recipe index a8292162d..e10d55e34 100644 --- a/dev-libs/nss/nss-3.38.recipe +++ b/dev-libs/nss/nss-3.38.recipe @@ -11,7 +11,7 @@ LICENSE=" GNU LGPL v2.1 MPL v2.0 " -REVISION="1" +REVISION="2" NSS_VERSION=`echo $portVersion | sed 's/\./_/g'` SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz" CHECKSUM_SHA256="2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62" @@ -40,7 +40,9 @@ PROVIDES=" cmd:derdump$secondaryArchSuffix = $portVersion compat >= 3 cmd:dertimetest$secondaryArchSuffix = $portVersion compat >= 3 cmd:digest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ecperf$secondaryArchSuffix = $portVersion compat >= 3 cmd:encodeinttest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:fbectest$secondaryArchSuffix = $portVersion compat >= 3 cmd:fipstest$secondaryArchSuffix = $portVersion compat >= 3 cmd:httpserv$secondaryArchSuffix = $portVersion compat >= 3 cmd:listsuites$secondaryArchSuffix = $portVersion compat >= 3 @@ -56,6 +58,7 @@ PROVIDES=" cmd:p7env$secondaryArchSuffix = $portVersion compat >= 3 cmd:p7sign$secondaryArchSuffix = $portVersion compat >= 3 cmd:p7verify$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11ectest$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk11gcmtest$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk11mode$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk12util$secondaryArchSuffix = $portVersion compat >= 3 @@ -65,6 +68,7 @@ PROVIDES=" cmd:pwdecrypt$secondaryArchSuffix = $portVersion compat >= 3 cmd:remtest$secondaryArchSuffix = $portVersion compat >= 3 cmd:rsaperf$secondaryArchSuffix = $portVersion compat >= 3 + cmd:rsapoptst$secondaryArchSuffix = $portVersion compat >= 3 cmd:sdrtest$secondaryArchSuffix = $portVersion compat >= 3 cmd:secmodtest$secondaryArchSuffix = $portVersion compat >= 3 cmd:selfserv$secondaryArchSuffix = $portVersion compat >= 3 diff --git a/dev-libs/nss/patches/nss-3.38.patchset b/dev-libs/nss/patches/nss-3.38.patchset index 175124a17..3097c66d8 100644 --- a/dev-libs/nss/patches/nss-3.38.patchset +++ b/dev-libs/nss/patches/nss-3.38.patchset @@ -1,4 +1,4 @@ -From 0bcab86e8052741075e7784b16365d858c4cef26 Mon Sep 17 00:00:00 2001 +From 39be17d43f0617c1be3ebedea0de66274198a97f Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 5 Jul 2014 02:12:23 +0200 Subject: Haiku support @@ -62,7 +62,7 @@ index 0a4f6dc..09a6061 100644 2.16.4 -From 20db9826bcbab8c25dbc144b26baef45c2e0a38a Mon Sep 17 00:00:00 2001 +From 20cf03ba85446af467412cb0deac7cb0f6a9105f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 13:09:35 +0000 Subject: define RTLD_NOLOAD @@ -87,7 +87,7 @@ index c42f694..edee40a 100644 2.16.4 -From 40ae2f60e37810645e7333854fd3de2bc1e559fc Mon Sep 17 00:00:00 2001 +From dd52aec0fb65d7d3b5589ea3ceba11ae2621fea6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 13:40:13 +0000 Subject: skip optionally the signing part @@ -119,7 +119,7 @@ index b53cfea..51fe162 100644 2.16.4 -From c69a04ef7c7cc2c26164ed9093b39fdd97053dce Mon Sep 17 00:00:00 2001 +From c86a94c9bd7fd517ee8a6a6a60e49c6816bbfd20 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 14:14:26 +0000 Subject: use system libs @@ -140,7 +140,7 @@ index 51fe162..fe54580 100644 2.16.4 -From 3043ae22ed9abd78879e04210254d776577f4566 Mon Sep 17 00:00:00 2001 +From d435fa2da7e973dcebce3ccfc583eeef13b3724a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 24 Nov 2015 19:12:08 +0000 Subject: avoid some tests. @@ -159,7 +159,7 @@ index fe54580..3bc0ce3 100644 2.16.4 -From c9c72fae93c067ab69f40dc4d4c268ae16ce75ef Mon Sep 17 00:00:00 2001 +From 0199b7c66768cdacd57776478e6578bdb051d47a Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Fri, 27 Apr 2018 21:38:56 +0200 Subject: Enable -Bsymbolic for BeOS target @@ -183,7 +183,7 @@ index bff11c7..0c4272f 100644 2.16.4 -From def6789653860642ac817f0d86b0a96f152b58b2 Mon Sep 17 00:00:00 2001 +From ea85a23696880f54ed12e5a56b19df790565213a Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 11 Aug 2018 00:46:36 +0200 Subject: Define XP_HAIKU @@ -206,3 +206,28 @@ index 3bc0ce3..d25df28 100644 -- 2.16.4 + +From 73a6d03d4784d65dfbca538d3fc00017c69491e1 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 14 Aug 2018 09:00:06 +1000 +Subject: Fix build for x64 + + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index d25df28..9cc8afc 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -27,6 +27,10 @@ else + CPU_ARCH = x86 + endif + ++ifeq ($(USE_64),1) ++ CPU_ARCH = x86_64 ++endif ++ + MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) + ifdef BUILD_OPT + OPTIMIZER = -O2 +-- +2.16.4 +