[packages/nss] Revert mistaken "- added include patch (missing include in <nss/secmodt.h> file)"

qboosh qboosh at pld-linux.org
Sat Jun 12 20:39:48 CEST 2021


commit d59f158eaa08380619bf76ffcf0657bd32bb3f27
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 12 20:41:21 2021 +0200

    Revert mistaken "- added include patch (missing include in <nss/secmodt.h> file)"
    
    This reverts commit 8f7a983c54bcdbfc1f0730e965ecb52af6834544.

 nss-include.patch | 10 ----------
 nss.spec          |  5 ++---
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 194416a..f4feb6b 100644
--- a/nss.spec
+++ b/nss.spec
@@ -8,7 +8,7 @@ Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
 Version:	3.67
-Release:	2
+Release:	1
 Epoch:		1
 License:	MPL v2.0
 Group:		Libraries
@@ -19,7 +19,7 @@ Source2:	%{name}-config.in
 Source3:	https://www.cacert.org/certs/root.der
 # Source3-md5:	a61b375e390d9c3654eebd2031461f6b
 Source4:	nss-softokn.pc.in
-Patch0:		%{name}-include.patch
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
 URL:		https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires:	nspr-devel >= %{nspr_ver}
 %{!?with_bootstrap:BuildRequires:	nss-tools}
@@ -106,7 +106,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
diff --git a/nss-include.patch b/nss-include.patch
deleted file mode 100644
index 8dec6ad..0000000
--- a/nss-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Add missing include for CK_NSS_GetFIPSStatus
---- nss-3.67/nss/lib/pk11wrap/secmodt.h.orig	2021-06-10 14:33:12.000000000 +0200
-+++ nss-3.67/nss/lib/pk11wrap/secmodt.h	2021-06-12 20:04:23.036409180 +0200
-@@ -9,5 +9,6 @@
- #include "secoid.h"
- #include "secasn1.h"
- #include "pkcs11t.h"
-+#include "pkcs11n.h"
- #include "utilmodt.h"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/d59f158eaa08380619bf76ffcf0657bd32bb3f27



More information about the pld-cvs-commit mailing list