ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 14:48:25 +03:00
Code Issues Projects Releases Wiki Activity

nss: Update to 3.16

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-22 14:54:36 +02:00
parent 393c9f2e02
commit 6fe24bda2d
3 changed files with 32 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/development/libraries/nss/85_security_load.patch
View File

@ -1,25 +1,29 @@
## 85_security_load.patch by Mike Hommey <glandium@debian.org> diff -ru nss-3.16-orig/nss/cmd/shlibsign/shlibsign.c nss-3.16/nss/cmd/shlibsign/shlibsign.c
## --- nss-3.16-orig/nss/cmd/shlibsign/shlibsign.c 2014-03-14 21:31:59.000000000 +0100
## All lines beginning with `## DP:' are a description of the patch. +++ nss-3.16/nss/cmd/shlibsign/shlibsign.c 2014-04-22 14:50:31.340743655 +0200
## DP: Load modules from $ORIGIN/nss. @@ -852,6 +852,8 @@
Index: nss/nss/cmd/shlibsign/shlibsign.c
===================================================================
--- nss.orig/nss/cmd/shlibsign/shlibsign.c 2013-08-05 14:40:31.041657554 +0900
+++ nss/nss/cmd/shlibsign/shlibsign.c 2013-08-05 14:40:31.033657739 +0900
@@ -851,6 +851,8 @@
libname = PR_GetLibraryName(NULL, "softokn3"); libname = PR_GetLibraryName(NULL, "softokn3");
assert(libname != NULL); assert(libname != NULL);
lib = PR_LoadLibrary(libname); lib = PR_LoadLibrary(libname);
+ if (!lib) + if (!lib)
+ lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so"); + lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
assert(lib != NULL); assert(lib != NULL);
PR_FreeLibraryName(libname); PR_FreeLibraryName(libname);
Index: nss/nss/lib/pk11wrap/pk11load.c Only in nss-3.16/nss/cmd/shlibsign: shlibsign.c.orig
=================================================================== diff -ru nss-3.16-orig/nss/coreconf/config.mk nss-3.16/nss/coreconf/config.mk
--- nss.orig/nss/lib/pk11wrap/pk11load.c 2013-08-05 14:40:31.041657554 +0900 --- nss-3.16-orig/nss/coreconf/config.mk 2014-03-14 21:31:59.000000000 +0100
+++ nss/nss/lib/pk11wrap/pk11load.c 2013-08-05 14:40:31.033657739 +0900 +++ nss-3.16/nss/coreconf/config.mk 2014-04-22 14:50:51.302731097 +0200
@@ -188,3 +188,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 nss-3.16-orig/nss/lib/pk11wrap/pk11load.c nss-3.16/nss/lib/pk11wrap/pk11load.c
--- nss-3.16-orig/nss/lib/pk11wrap/pk11load.c 2014-03-14 21:31:59.000000000 +0100
+++ nss-3.16/nss/lib/pk11wrap/pk11load.c 2014-04-22 14:50:22.164749330 +0200
@@ -406,6 +406,13 @@ @@ -406,6 +406,13 @@
* unload the library if anything goes wrong from here on out... * unload the library if anything goes wrong from here on out...
*/ */
@ -34,18 +38,17 @@ Index: nss/nss/lib/pk11wrap/pk11load.c
mod->library = (void *)library; mod->library = (void *)library;
if (library == NULL) { if (library == NULL) {
Index: nss/nss/lib/util/secload.c diff -ru nss-3.16-orig/nss/lib/util/secload.c nss-3.16/nss/lib/util/secload.c
=================================================================== --- nss-3.16-orig/nss/lib/util/secload.c 2014-03-14 21:31:59.000000000 +0100
--- nss.orig/nss/lib/util/secload.c 2013-08-05 14:40:31.041657554 +0900 +++ nss-3.16/nss/lib/util/secload.c 2014-04-22 14:50:31.342743654 +0200
+++ nss/nss/lib/util/secload.c 2013-08-05 14:40:31.033657739 +0900
@@ -69,9 +69,14 @@ @@ -69,9 +69,14 @@
/* Remove the trailing filename from referencePath and add the new one */ /* Remove the trailing filename from referencePath and add the new one */
c = strrchr(referencePath, PR_GetDirectorySeparator()); c = strrchr(referencePath, PR_GetDirectorySeparator());
+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] + 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 /usr/lib */ + * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
+ referencePath = "/usr/lib/"; + referencePath = NIX_NSS_LIBDIR;
+ c = &referencePath[8]; /* last / */ + c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
+ } + }
if (c) { if (c) {
size_t referencePathSize = 1 + c - referencePath; size_t referencePathSize = 1 + c - referencePath;
@ -54,7 +57,7 @@ Index: nss/nss/lib/util/secload.c
if (fullName) { if (fullName) {
memcpy(fullName, referencePath, referencePathSize); memcpy(fullName, referencePath, referencePathSize);
strcpy(fullName + referencePathSize, name); strcpy(fullName + referencePathSize, name);
@@ -81,6 +86,12 @@ @@ -81,6 +86,11 @@
#endif #endif
libSpec.type = PR_LibSpec_Pathname; libSpec.type = PR_LibSpec_Pathname;
libSpec.value.pathname = fullName; libSpec.value.pathname = fullName;
@ -62,12 +65,11 @@ Index: nss/nss/lib/util/secload.c
+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { + (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
+ memcpy(fullName + referencePathSize -4, "lib", 3); + memcpy(fullName + referencePathSize -4, "lib", 3);
+ } + }
+ strcpy(fullName + referencePathSize, "nss/"); + strcpy(fullName + referencePathSize, name);
+ strcpy(fullName + referencePathSize + 4, name);
dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
#ifdef PR_LD_ALT_SEARCH_PATH #ifdef PR_LD_ALT_SEARCH_PATH
/* allow library's dependencies to be found in the same directory /* allow library's dependencies to be found in the same directory
@@ -88,6 +99,10 @@ @@ -88,6 +98,10 @@
| PR_LD_ALT_SEARCH_PATH | PR_LD_ALT_SEARCH_PATH
#endif #endif
); );

9
pkgs/development/libraries/nss/default.nix
View File

@ -11,11 +11,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "nss-${version}"; name = "nss-${version}";
version = "3.15.4"; version = "3.16";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/${name}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_RTM/src/${name}.tar.gz";
sha1 = "c164fac83fcbaff010786767e2a858ca23a89a5b"; sha1 = "981dc6ef2f1e69ec7e2b277ce27c7005e9837f95";
}; };
buildInputs = [ nspr perl zlib sqlite ]; buildInputs = [ nspr perl zlib sqlite ];
@ -26,9 +26,8 @@ in stdenv.mkDerivation rec {
patches = patches =
[ ./nss-3.15-gentoo-fixups.patch [ ./nss-3.15-gentoo-fixups.patch
# from http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
./85_security_load.patch ./85_security_load.patch
./nix_secload_fixup.patch
]; ];
postPatch = '' postPatch = ''

48
pkgs/development/libraries/nss/nix_secload_fixup.patch
View File

@ -1,48 +0,0 @@
diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
--- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c 2013-08-07 16:03:40.013256377 +0200
+++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c 2013-08-07 16:04:21.128410153 +0200
@@ -853,7 +853,7 @@
assert(libname != NULL);
lib = PR_LoadLibrary(libname);
if (!lib)
- lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so");
+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
assert(lib != NULL);
PR_FreeLibraryName(libname);
diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
--- nss-3.15.1-orig/nss/coreconf/config.mk 2013-06-27 19:58:08.000000000 +0200
+++ nss-3.15.1/nss/coreconf/config.mk 2013-08-07 16:11:27.364608802 +0200
@@ -181,3 +181,6 @@
# Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
DEFINES += -DNO_NSPR_10_SUPPORT
+
+# Nix specific stuff.
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
--- nss-3.15.1-orig/nss/lib/util/secload.c 2013-08-07 16:03:40.014256381 +0200
+++ nss-3.15.1/nss/lib/util/secload.c 2013-08-07 16:05:02.453563064 +0200
@@ -70,9 +70,9 @@
/* 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 /usr/lib */
- referencePath = "/usr/lib/";
- c = &referencePath[8]; /* last / */
+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
+ referencePath = NIX_NSS_LIBDIR;
+ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
}
if (c) {
size_t referencePathSize = 1 + c - referencePath;
@@ -90,8 +90,7 @@
(strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
memcpy(fullName + referencePathSize -4, "lib", 3);
}
- strcpy(fullName + referencePathSize, "nss/");
- strcpy(fullName + referencePathSize + 4, name);
+ 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