mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
This reverts commit 4097456621.
This commit is contained in:
@@ -12,12 +12,12 @@ LICENSE="GNU GPL v2
|
||||
REVISION="1"
|
||||
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="bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278"
|
||||
CHECKSUM_SHA256="3bf7e0ed7db98803f134c527c436cc68415ff17257d34bd75de14e9a09d13651"
|
||||
SOURCE_DIR="nss-$portVersion/nss"
|
||||
PATCHES="nss-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
nss$secondaryArchSuffix = $portVersion compat >= 3
|
||||
@@ -84,7 +84,6 @@ PROVIDES="
|
||||
lib:libfreebl3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libnss3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libnssckbi$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libnssckbi_testlib$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libnssdbm3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libnssutil3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libsmime3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
@@ -103,7 +102,6 @@ PROVIDES_devel="
|
||||
devel:libfreebl3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libnss3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libnssckbi$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libnssckbi_testlib$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libnssdbm3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libnssutil3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libsmime3$secondaryArchSuffix = $portVersion compat >= 3
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8f0b75776fe515ad92b9925bf919415e922efd93 Mon Sep 17 00:00:00 2001
|
||||
From e22b4ac23e017e5cead121558520c151d2c8ef2a Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Sat, 5 Jul 2014 02:12:23 +0200
|
||||
Subject: Haiku support
|
||||
@@ -27,7 +27,7 @@ index 750696d..b53cfea 100644
|
||||
OPTIMIZER = -O2
|
||||
endif
|
||||
diff --git a/coreconf/arch.mk b/coreconf/arch.mk
|
||||
index 790372d..24835d0 100644
|
||||
index 79e56d5..0c9ccd3 100644
|
||||
--- a/coreconf/arch.mk
|
||||
+++ b/coreconf/arch.mk
|
||||
@@ -33,6 +33,14 @@ else
|
||||
@@ -59,10 +59,10 @@ index e961dd1..58a6481 100644
|
||||
#ifndef BYTE_ORDER
|
||||
#define BYTE_ORDER __BYTE_ORDER
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From c57c477c1e5567a97d277c2a09603a47982048a6 Mon Sep 17 00:00:00 2001
|
||||
From f054122c30c56d9fc54edbf2f244b072c562ba65 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 25 Sep 2014 13:09:35 +0000
|
||||
Subject: define RTLD_NOLOAD
|
||||
@@ -84,10 +84,10 @@ index c42f694..edee40a 100644
|
||||
* fetch the library if it's loaded. For NSS it should already be loaded
|
||||
*/
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 59ff9f124ee0713c7c2b3845a323de45a18acfaf Mon Sep 17 00:00:00 2001
|
||||
From 7b2f76ef5470761714572b0052c9ba1700e5f475 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 25 Sep 2014 13:40:13 +0000
|
||||
Subject: skip optionally the signing part
|
||||
@@ -116,10 +116,10 @@ index b53cfea..51fe162 100644
|
||||
+
|
||||
+SKIP_SHLIBSIGN=1
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 18fb7aeff1e402d747343e6eab22451001a91ca2 Mon Sep 17 00:00:00 2001
|
||||
From ab70f80bf43996bbfd008b4d079a8f07bb3ae799 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 25 Sep 2014 14:14:26 +0000
|
||||
Subject: use system libs
|
||||
@@ -137,10 +137,10 @@ index 51fe162..fe54580 100644
|
||||
+ZLIB_LIBS = -lz
|
||||
+NSS_USE_SYSTEM_SQLITE=1
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 624fa1540429e9285bd5d9d5bf7c1ce748c10750 Mon Sep 17 00:00:00 2001
|
||||
From b03a185b82f8b8749827a6a8823c5c9a98fafde9 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 24 Nov 2015 19:12:08 +0000
|
||||
Subject: avoid some tests.
|
||||
@@ -156,10 +156,10 @@ index fe54580..3bc0ce3 100644
|
||||
NSS_USE_SYSTEM_SQLITE=1
|
||||
+NSS_DISABLE_GTESTS=1
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 596b3afad7ca65c80c667215c5c2846d3779a156 Mon Sep 17 00:00:00 2001
|
||||
From ae369f44e6caa23f9935a251903b19f63b187982 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Fri, 27 Apr 2018 21:38:56 +0200
|
||||
Subject: Enable -Bsymbolic for BeOS target
|
||||
@@ -167,10 +167,10 @@ Subject: Enable -Bsymbolic for BeOS target
|
||||
* Fixes infinite loop in RNG_RNGInit.
|
||||
|
||||
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
|
||||
index 3e75dbf..27fbf16 100644
|
||||
index d5dd4bb..40a68f5 100644
|
||||
--- a/lib/freebl/Makefile
|
||||
+++ b/lib/freebl/Makefile
|
||||
@@ -323,7 +323,7 @@ endif
|
||||
@@ -301,7 +301,7 @@ endif
|
||||
# to bind the blapi function references in FREEBLVector vector
|
||||
# (ldvector.c) to the blapi functions defined in the freebl
|
||||
# shared libraries.
|
||||
@@ -180,10 +180,10 @@ index 3e75dbf..27fbf16 100644
|
||||
endif
|
||||
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 347d8e55c919291e4a02caa4bea19e7888bcd4cd Mon Sep 17 00:00:00 2001
|
||||
From 43157854586333ff89646a077ace06c64c95130c Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Sat, 11 Aug 2018 00:46:36 +0200
|
||||
Subject: Define XP_HAIKU
|
||||
@@ -204,10 +204,10 @@ index 3bc0ce3..d25df28 100644
|
||||
USE_PTHREADS = 1
|
||||
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From b6f3b2106f3ba4498e08683a5c30699108729789 Mon Sep 17 00:00:00 2001
|
||||
From beecbae173e26da24284798d5226c3726752221c 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
|
||||
@@ -229,10 +229,10 @@ index d25df28..9cc8afc 100644
|
||||
ifdef BUILD_OPT
|
||||
OPTIMIZER = -O2
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From f45cd02b3b7c77e1bed313a1974eb63b998f19dd Mon Sep 17 00:00:00 2001
|
||||
From 37926061c79f3e489eed9e2e101e7428bef4eee0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 15 Aug 2018 11:12:46 +1000
|
||||
Subject: Fix build for x86
|
||||
@@ -252,10 +252,10 @@ index c7277f3..eb806e2 100644
|
||||
}
|
||||
}
|
||||
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c
|
||||
index 0f500d6..61a8264 100644
|
||||
index fb2d8d5..e995b4e 100644
|
||||
--- a/cmd/selfserv/selfserv.c
|
||||
+++ b/cmd/selfserv/selfserv.c
|
||||
@@ -2620,7 +2620,7 @@ main(int argc, char **argv)
|
||||
@@ -2564,7 +2564,7 @@ main(int argc, char **argv)
|
||||
FILE *tmpfile = fopen(pidFile, "w+");
|
||||
|
||||
if (tmpfile) {
|
||||
@@ -265,4 +265,5 @@ index 0f500d6..61a8264 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.26.0
|
||||
2.24.0
|
||||
|
||||
Reference in New Issue
Block a user