nss: Update to version 3.14.3.

This update involves a bunch of fixes on our side:

Update the Gentoo patch to 3.14.1 from http://bit.ly/ZG8OK5 and drop the older
one from http://bit.ly/15mN0X1 (for 3.12.5).

While checking the old patch from Gentoo, I discovered, that the patch added in
revision 06c543b11d wasn't the original one in the
Gentoo repository.

Instead of doing the same again, we now patch up our specific modifications
using sed within the postPatch hook.

In addition to that, we now have another patch from RedHat/Fedora which syncs
the NSS PEM support repository with the latest upstream changes. Patch is coming
from the SRPM at http://koji.fedoraproject.org/koji/rpminfo?rpmID=3772072 and I
just stripped the "0001-" prefix from the filename.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig
2013-03-01 09:42:38 +01:00
parent fc088ae732
commit 964621438a
3 changed files with 454 additions and 38 deletions
+19 -5
View File
@@ -22,11 +22,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.14";
version = "3.14.3";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/${name}.tar.gz";
sha1 = "ace3642fb2ca67854ea7075d053ca01a6d81e616";
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
};
buildInputs = [ nspr perl zlib sqlite ];
@@ -38,14 +38,28 @@ in stdenv.mkDerivation rec {
'';
patches = [
./nss-3.12.5-gentoo-fixups.diff
./nss-3.14.1-gentoo-fixups-r1.patch
secLoadPatch
./nix_secload_fixup.patch
./sync-up-with-upstream-softokn-changes.patch
];
postPatch = ''
sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile
# Fix up the patch from Gentoo
sed -i \
-e "/^PREFIX =/s|= /usr|= $out|" \
-e '/@libdir@/s|gentoo/nss|lib|' \
-e '/ln -sf/d' \
mozilla/security/nss/config/Makefile
# Note for spacing/tab nazis: The TAB characters are intentional!
cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
install:
mkdir -p \$(DIST)/lib/pkgconfig
cp nss.pc \$(DIST)/lib/pkgconfig
INSTALL_TARGET
'';
preConfigure = "cd mozilla/security/nss";