mbakke pushed a commit to branch staging
in repository guix.
commit e4db21bcf634ac6bf8acc63659760659c44c8aeb
Author: Marius Bakke <[email protected]>
AuthorDate: Wed Feb 12 16:33:50 2020 +0100
gnu: nss: Remove obsolete patch.
* gnu/packages/patches/nss-freebl-stubs.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/nss.scm (nss)[source](patches): Remove
'nss-freebl-stubs.patch'.
---
gnu/local.mk | 1 -
gnu/packages/nss.scm | 1 -
gnu/packages/patches/nss-freebl-stubs.patch | 20 --------------------
3 files changed, 22 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9a316f6..f54a457 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1212,7 +1212,6 @@ dist_patch_DATA =
\
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/nm-plugin-path.patch \
%D%/packages/patches/nsis-env-passthru.patch \
- %D%/packages/patches/nss-freebl-stubs.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 2948917..28ca76d 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -84,7 +84,6 @@ in the Mozilla clients.")
"0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch"
- "nss-freebl-stubs.patch"
"nss-increase-test-timeout.patch"))))
(build-system gnu-build-system)
(outputs '("out" "bin"))
diff --git a/gnu/packages/patches/nss-freebl-stubs.patch
b/gnu/packages/patches/nss-freebl-stubs.patch
deleted file mode 100644
index 3f7b47b..0000000
--- a/gnu/packages/patches/nss-freebl-stubs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch is required for Makefile-based builds of NSS 3.45 on armhf-linux.
-
-Taken from upstream bug tracker:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1571316
-
-diff --git a/nss/lib/freebl/ecl/curve25519_32.c
b/nss/lib/freebl/ecl/curve25519_32.c
---- a/nss/lib/freebl/ecl/curve25519_32.c
-+++ b/nss/lib/freebl/ecl/curve25519_32.c
-@@ -29,6 +29,10 @@
- * 1. Convert custom integer types to stdint.h types
- */
-
-+#ifdef FREEBL_NO_DEPEND
-+#include "../stubs.h"
-+#endif
-+
- #include "ecl-priv.h"
-
- /* fe means field element. Here the field is \Z/(2^255-19). An element t,
-
