From 21d259321d188e4bf3ec65de04e2abd2f3ef77bf Mon Sep 17 00:00:00 2001
From: Bob Relyea <rrelyea@redhat.com>
Date: Jun 05 2020 20:41:56 +0000
Subject: Resolves: rhbz#1843417

    Cannot compile code with pk11pub.h (an nss header) with -Werror=strict-prototypes

---

diff --git a/nss-3.53-strict-proto-fix.patch b/nss-3.53-strict-proto-fix.patch
new file mode 100644
index 0000000..e69c977
--- /dev/null
+++ b/nss-3.53-strict-proto-fix.patch
@@ -0,0 +1,12 @@
+diff -up ./lib/pk11wrap/pk11pub.h.strict_proto_fix ./lib/pk11wrap/pk11pub.h
+--- ./lib/pk11wrap/pk11pub.h.strict_proto_fix	2020-06-04 16:48:54.721954514 -0700
++++ ./lib/pk11wrap/pk11pub.h	2020-06-04 16:49:17.074066050 -0700
+@@ -948,7 +948,7 @@ PRBool SECMOD_HasRootCerts(void);
+  *  the system state independent of the database state and can be called
+  *  before NSS initializes.
+  */
+-int SECMOD_GetSystemFIPSEnabled();
++int SECMOD_GetSystemFIPSEnabled(void);
+ 
+ SEC_END_PROTOS
+ 
diff --git a/nss.spec b/nss.spec
index 70100a1..4283afc 100644
--- a/nss.spec
+++ b/nss.spec
@@ -43,7 +43,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -111,7 +111,8 @@ Patch12:          nss-signtool-format.patch
 Patch20:          nss-gcm-param-default-pkcs11v2.patch
 %endif
 %endif
-
+# Upstream bug https://bugzilla.mozilla.org/show_bug.cgi?id=1643528
+Patch30:          nss-3.53-strict-proto-fix.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -875,6 +876,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Fri Jun  5 2020 Bob Relyea <rrelyea@redhat.com> - 3.53.0-2
+- Fix non-strict prototype in pk11pub.h
+
 * Mon Jun  1 2020 Daiki Ueno <dueno@redhat.com> - 3.53.0-1
 - Update to NSS 3.53