public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nss: 3.20.1 -> 3.21

Browse Source
This commit is contained in:
Eelco Dolstra 2015-12-16 16:18:42 +01:00
parent f8c6ced636
commit 86bf3662df
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ diff -ru nss-3.16-orig/nss/lib/util/secload.c nss-3.16/nss/lib/util/secload.c
+ 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 NIX_NSS_LIBDIR */ + * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
+ referencePath = NIX_NSS_LIBDIR; + referencePath = NIX_NSS_LIBDIR;
+ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ + c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
+ } + }
if (c) { if (c) {
size_t referencePathSize = 1 + c - referencePath; size_t referencePathSize = 1 + c - referencePath;

10
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.20.1"; version = "3.21";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/${name}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz";
sha256 = "ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97"; sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239";
}; };
buildInputs = [ nspr perl zlib sqlite ]; buildInputs = [ nspr perl zlib sqlite ];
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
''; '';
patches = patches =
[ ./nss-3.17-gentoo-fixups.patch [ ./nss-3.21-gentoo-fixups.patch
# Based on 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
]; ];
@ -58,6 +58,8 @@ in stdenv.mkDerivation rec {
"NSS_USE_SYSTEM_SQLITE=1" "NSS_USE_SYSTEM_SQLITE=1"
] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
NIX_CFLAGS_COMPILE = "-Wno-error";
postInstall = '' postInstall = ''
rm -rf $out/private rm -rf $out/private
mv $out/public $out/include mv $out/public $out/include

38
pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch → pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch
View File

@ -1,5 +1,6 @@
--- nss-3.17.1/nss/config/Makefile diff -urN a/nss/config/Makefile b/nss/config/Makefile
+++ nss-3.17.1/nss/config/Makefile --- a/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ b/nss/config/Makefile 2015-11-15 10:42:46.249578304 -0600
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+CORE_DEPTH = .. +CORE_DEPTH = ..
+DEPTH = .. +DEPTH = ..
@ -41,8 +42,9 @@
+ +
+dummy: all export libs +dummy: all export libs
+ +
--- nss-3.17.1/nss/config/nss-config.in diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in
+++ nss-3.17.1/nss/config/nss-config.in --- a/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
+++ b/nss/config/nss-config.in 2015-11-15 10:42:46.250578304 -0600
@@ -0,0 +1,145 @@ @@ -0,0 +1,145 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -189,8 +191,9 @@
+ echo $libdirs + echo $libdirs
+fi +fi
+ +
--- nss-3.17.1/nss/config/nss.pc.in diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in
+++ nss-3.17.1/nss/config/nss.pc.in --- a/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ b/nss/config/nss.pc.in 2015-11-15 10:42:46.251578304 -0600
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
@ -201,12 +204,13 @@
+Description: Network Security Services +Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8 +Requires: nspr >= 4.8
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir} +Cflags: -I${includedir}
+ +
--- nss-3.17.1/nss/Makefile diff -urN a/nss/Makefile b/nss/Makefile
+++ nss-3.17.1/nss/Makefile --- a/nss/Makefile 2015-11-15 09:25:06.410786060 -0600
@@ -44,7 +44,7 @@ +++ b/nss/Makefile 2015-11-15 10:42:46.252578304 -0600
@@ -46,7 +46,7 @@
# (7) Execute "local" rules. (OPTIONAL). # # (7) Execute "local" rules. (OPTIONAL). #
####################################################################### #######################################################################
@ -215,7 +219,7 @@
nss_clean_all: clobber_nspr clobber nss_clean_all: clobber_nspr clobber
@@ -109,12 +109,6 @@ @@ -115,12 +115,6 @@
--with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include' --with-dist-includedir='$(NSPR_PREFIX)/include'
@ -228,14 +232,12 @@
build_docs: build_docs:
$(MAKE) -C $(CORE_DEPTH)/doc $(MAKE) -C $(CORE_DEPTH)/doc
--- nss-3.17.1/nss/manifest.mn diff -urN a/nss/manifest.mn b/nss/manifest.mn
+++ nss-3.17.1/nss/manifest.mn --- a/nss/manifest.mn 2015-11-15 09:25:06.411786060 -0600
@@ -10,7 +10,7 @@ +++ b/nss/manifest.mn 2015-11-15 10:43:15.633576994 -0600
@@ -10,4 +10,4 @@
RELEASE = nss RELEASE = nss
-DIRS = coreconf lib cmd -DIRS = coreconf lib cmd external_tests
+DIRS = coreconf lib cmd config +DIRS = coreconf lib cmd config
ifdef NSS_BUILD_GTESTS
DIRS += external_tests