nss_3_44: drop
This commit is contained in:
ajs124
parent
dd9525240f
commit
36d2488cb6
@ -1,144 +0,0 @@
|
|||||||
{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
|
|
||||||
|
|
||||||
let
|
|
||||||
nssPEM = fetchurl {
|
|
||||||
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
|
|
||||||
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
|
|
||||||
};
|
|
||||||
version = "3.44.4";
|
|
||||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "nss";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "7ec1a52e20fd9a23e1907eeba8f4f2ecd619dac5d20fa023ec5b4faa1843e847";
|
|
||||||
};
|
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ perl ]
|
|
||||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
|
||||||
|
|
||||||
buildInputs = [ zlib sqlite ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ nspr ];
|
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
xz -d < ${nssPEM} | patch -p1
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches =
|
|
||||||
[
|
|
||||||
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
|
|
||||||
./85_security_load-3.44.patch
|
|
||||||
./ckpem.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
patchFlags = [ "-p0" ];
|
|
||||||
|
|
||||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
|
||||||
substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "tools" ];
|
|
||||||
|
|
||||||
preConfigure = "cd nss";
|
|
||||||
|
|
||||||
makeFlags = let
|
|
||||||
# NSS's build systems expects aarch32 to be called arm; if we pass in armv6l/armv7l, it
|
|
||||||
# fails with a linker error
|
|
||||||
cpu = if stdenv.hostPlatform.isAarch32 then "arm" else stdenv.hostPlatform.parsed.cpu.name;
|
|
||||||
in [
|
|
||||||
"NSPR_INCLUDE_DIR=${nspr.dev}/include"
|
|
||||||
"NSPR_LIB_DIR=${nspr.out}/lib"
|
|
||||||
"NSDISTMODE=copy"
|
|
||||||
"BUILD_OPT=1"
|
|
||||||
"SOURCE_PREFIX=\$(out)"
|
|
||||||
"NSS_ENABLE_ECC=1"
|
|
||||||
"USE_SYSTEM_ZLIB=1"
|
|
||||||
"NSS_USE_SYSTEM_SQLITE=1"
|
|
||||||
"NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
|
|
||||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
|
||||||
# Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with
|
|
||||||
# uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64
|
|
||||||
"OS_TEST=${cpu}"
|
|
||||||
"CPU_ARCH=${cpu}"
|
|
||||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
|
|
||||||
"CROSS_COMPILE=1"
|
|
||||||
"NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
|
|
||||||
] ++ lib.optional stdenv.is64bit "USE_64=1"
|
|
||||||
++ lib.optional stdenv.isDarwin "CCC=clang++";
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
|
||||||
|
|
||||||
# TODO(@oxij): investigate this: `make -n check` works but `make
|
|
||||||
# check` fails with "no rule", same for "installcheck".
|
|
||||||
doCheck = false;
|
|
||||||
doInstallCheck = false;
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
rm -rf $out/private
|
|
||||||
mv $out/public $out/include
|
|
||||||
mv $out/*.OBJ/* $out/
|
|
||||||
rmdir $out/*.OBJ
|
|
||||||
|
|
||||||
ln -s lib $out/lib64
|
|
||||||
|
|
||||||
# Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
|
|
||||||
# https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
|
|
||||||
NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
|
|
||||||
NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
|
|
||||||
NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
|
|
||||||
PREFIX="$out"
|
|
||||||
|
|
||||||
mkdir -p $out/lib/pkgconfig
|
|
||||||
sed -e "s,%prefix%,$PREFIX," \
|
|
||||||
-e "s,%exec_prefix%,$PREFIX," \
|
|
||||||
-e "s,%libdir%,$PREFIX/lib64," \
|
|
||||||
-e "s,%includedir%,$dev/include/nss," \
|
|
||||||
-e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
|
|
||||||
-e "s,%NSPR_VERSION%,4.16,g" \
|
|
||||||
pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
|
|
||||||
chmod 0644 $out/lib/pkgconfig/nss.pc
|
|
||||||
|
|
||||||
sed -e "s,@prefix@,$PREFIX," \
|
|
||||||
-e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
|
|
||||||
-e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
|
|
||||||
-e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
|
|
||||||
pkg/pkg-config/nss-config.in > $out/bin/nss-config
|
|
||||||
chmod 0755 $out/bin/nss-config
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = let
|
|
||||||
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
|
|
||||||
nss = if isCross then buildPackages.nss.tools else "$out";
|
|
||||||
in ''
|
|
||||||
for libname in freebl3 nssdbm3 softokn3
|
|
||||||
do '' +
|
|
||||||
(if stdenv.isDarwin
|
|
||||||
then ''
|
|
||||||
libfile="$out/lib/lib$libname.dylib"
|
|
||||||
DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
|
|
||||||
'' else ''
|
|
||||||
libfile="$out/lib/lib$libname.so"
|
|
||||||
LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
|
|
||||||
'') + ''
|
|
||||||
${nss}/bin/shlibsign -v -i "$libfile"
|
|
||||||
done
|
|
||||||
|
|
||||||
moveToOutput bin "$tools"
|
|
||||||
moveToOutput bin/nss-config "$dev"
|
|
||||||
moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
|
|
||||||
rm -f "$out"/lib/*.a
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://developer.mozilla.org/en-US/docs/NSS";
|
|
||||||
description = "A set of libraries for development of security-enabled client and server applications";
|
|
||||||
license = licenses.mpl20;
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,81 +0,0 @@
|
|||||||
diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
|
|
||||||
--- nss/cmd/shlibsign/shlibsign.c 2017-01-04 15:24:24.000000000 +0100
|
|
||||||
+++ nss/cmd/shlibsign/shlibsign.c 2017-01-24 14:43:31.030420852 +0100
|
|
||||||
@@ -875,6 +875,8 @@
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
lib = PR_LoadLibrary(libname);
|
|
||||||
+ if (!lib)
|
|
||||||
+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
|
|
||||||
assert(lib != NULL);
|
|
||||||
if (!lib) {
|
|
||||||
PR_fprintf(PR_STDERR, "loading softokn3 failed");
|
|
||||||
diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
|
|
||||||
--- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100
|
|
||||||
+++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100
|
|
||||||
@@ -202,3 +202,6 @@
|
|
||||||
|
|
||||||
# Hide old, deprecated, TLS cipher suite names when building NSS
|
|
||||||
DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
|
|
||||||
+
|
|
||||||
+# Nix specific stuff.
|
|
||||||
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
|
|
||||||
diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
|
|
||||||
--- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100
|
|
||||||
+++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100
|
|
||||||
@@ -440,6 +440,13 @@
|
|
||||||
* unload the library if anything goes wrong from here on out...
|
|
||||||
*/
|
|
||||||
library = PR_LoadLibrary(mod->dllName);
|
|
||||||
+ if ((library == NULL) &&
|
|
||||||
+ !rindex(mod->dllName, PR_GetDirectorySeparator())) {
|
|
||||||
+ library = PORT_LoadLibraryFromOrigin(my_shlib_name,
|
|
||||||
+ (PRFuncPtr) &softoken_LoadDSO,
|
|
||||||
+ mod->dllName);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
mod->library = (void *)library;
|
|
||||||
|
|
||||||
if (library == NULL) {
|
|
||||||
diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c
|
|
||||||
--- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100
|
|
||||||
+++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100
|
|
||||||
@@ -70,9 +70,14 @@
|
|
||||||
|
|
||||||
/* Remove the trailing filename from referencePath and add the new one */
|
|
||||||
c = strrchr(referencePath, PR_GetDirectorySeparator());
|
|
||||||
+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
|
|
||||||
+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
|
|
||||||
+ referencePath = NIX_NSS_LIBDIR;
|
|
||||||
+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
|
|
||||||
+ }
|
|
||||||
if (c) {
|
|
||||||
size_t referencePathSize = 1 + c - referencePath;
|
|
||||||
- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);
|
|
||||||
+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
|
|
||||||
if (fullName) {
|
|
||||||
memcpy(fullName, referencePath, referencePathSize);
|
|
||||||
strcpy(fullName + referencePathSize, name);
|
|
||||||
@@ -82,6 +87,11 @@
|
|
||||||
#endif
|
|
||||||
libSpec.type = PR_LibSpec_Pathname;
|
|
||||||
libSpec.value.pathname = fullName;
|
|
||||||
+ if ((referencePathSize >= 4) &&
|
|
||||||
+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
|
|
||||||
+ memcpy(fullName + referencePathSize -4, "lib", 3);
|
|
||||||
+ }
|
|
||||||
+ strcpy(fullName + referencePathSize, name);
|
|
||||||
dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
|
|
||||||
#ifdef PR_LD_ALT_SEARCH_PATH
|
|
||||||
/* allow library's dependencies to be found in the same directory
|
|
||||||
@@ -89,6 +99,10 @@
|
|
||||||
| PR_LD_ALT_SEARCH_PATH
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
+ if (! dlh) {
|
|
||||||
+ strcpy(fullName + referencePathSize, name);
|
|
||||||
+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
|
|
||||||
+ }
|
|
||||||
PORT_Free(fullName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -16927,7 +16927,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
nss = lowPrio (callPackage ../development/libraries/nss { });
|
nss = lowPrio (callPackage ../development/libraries/nss { });
|
||||||
nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
|
|
||||||
nssTools = nss.tools;
|
nssTools = nss.tools;
|
||||||
|
|
||||||
# required for stable thunderbird and firefox-esr-78
|
# required for stable thunderbird and firefox-esr-78
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user