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

nss: Update to 3.17.2

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-14 20:26:51 +02:00
parent d4d0e449d7
commit f445fb8240
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.16.5"; version = "3.17.2";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/${name}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_2_RTM/src/${name}.tar.gz";
sha256 = "e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196"; sha256 = "134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b";
}; };
buildInputs = [ nspr perl zlib sqlite ]; buildInputs = [ nspr perl zlib sqlite ];
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
''; '';
patches = patches =
[ ./nss-3.15-gentoo-fixups.patch [ ./nss-3.17-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
]; ];

27
pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch → pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch
View File

@ -1,5 +1,5 @@
--- a/nss/config/Makefile --- nss-3.17.1/nss/config/Makefile
+++ b/nss/config/Makefile +++ nss-3.17.1/nss/config/Makefile
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+CORE_DEPTH = .. +CORE_DEPTH = ..
+DEPTH = .. +DEPTH = ..
@ -41,8 +41,8 @@
+ +
+dummy: all export libs +dummy: all export libs
+ +
--- a/nss/config/nss-config.in --- nss-3.17.1/nss/config/nss-config.in
+++ b/nss/config/nss-config.in +++ nss-3.17.1/nss/config/nss-config.in
@@ -0,0 +1,145 @@ @@ -0,0 +1,145 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -189,8 +189,8 @@
+ echo $libdirs + echo $libdirs
+fi +fi
+ +
--- a/nss/config/nss.pc.in --- nss-3.17.1/nss/config/nss.pc.in
+++ b/nss/config/nss.pc.in +++ nss-3.17.1/nss/config/nss.pc.in
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
@ -204,8 +204,8 @@
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir} +Cflags: -I${includedir}
+ +
--- a/nss/Makefile --- nss-3.17.1/nss/Makefile
+++ b/nss/Makefile +++ nss-3.17.1/nss/Makefile
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
# (7) Execute "local" rules. (OPTIONAL). # # (7) Execute "local" rules. (OPTIONAL). #
####################################################################### #######################################################################
@ -215,7 +215,7 @@
nss_clean_all: clobber_nspr clobber nss_clean_all: clobber_nspr clobber
@@ -103,12 +103,6 @@ @@ -109,12 +109,6 @@
--with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include' --with-dist-includedir='$(NSPR_PREFIX)/include'
@ -228,11 +228,14 @@
build_docs: build_docs:
$(MAKE) -C $(CORE_DEPTH)/doc $(MAKE) -C $(CORE_DEPTH)/doc
--- a/nss/manifest.mn --- nss-3.17.1/nss/manifest.mn
+++ b/nss/manifest.mn +++ nss-3.17.1/nss/manifest.mn
@@ -10,4 +10,4 @@ @@ -10,7 +10,7 @@
RELEASE = nss RELEASE = nss
-DIRS = coreconf lib cmd -DIRS = coreconf lib cmd
+DIRS = coreconf lib cmd config +DIRS = coreconf lib cmd config
ifdef NSS_BUILD_GTESTS
DIRS += external_tests