diff --git a/nss-pem-unitialized-vars.path b/nss-pem-unitialized-vars.path deleted file mode 100644 index f9a93a1..0000000 --- a/nss-pem-unitialized-vars.path +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ./lib/ckfw/pem/pinst.c.unitialized_vars ./lib/ckfw/pem/pinst.c ---- ./lib/ckfw/pem/pinst.c.unitialized_var 2016-05-21 19:04:24.471221863 -0700 -+++ ./lib/ckfw/pem/pinst.c 2016-05-21 19:31:07.124298651 -0700 -@@ -534,9 +534,9 @@ CK_RV - AddCertificate(char *certfile, char *keyfile, PRBool cacert, - CK_SLOT_ID slotID) - { -- pemInternalObject *o; -+ pemInternalObject *o = NULL; - CK_RV error = 0; -- int objid, i; -+ int objid, i = 0; - int nobjs = 0; - SECItem **objs = NULL; - char *ivstring = NULL; diff --git a/nss.spec b/nss.spec index 5d518bb..5239063 100644 --- a/nss.spec +++ b/nss.spec @@ -21,7 +21,7 @@ Name: nss Version: 3.25.0 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -179,7 +179,6 @@ low level services. %patch2 -p0 -b .relro %patch3 -p0 -b .transitional %patch16 -p0 -b .539183 -# link pem against buildroot's freebl, essential when mixing and matching %patch40 -p0 -b .noocsptest %patch47 -p0 -b .templates %patch49 -p0 -b .skipthem @@ -811,6 +810,9 @@ fi %changelog +* Tue Jun 28 2016 Elio Maldonado - 3.25.0-4 +- Remove obsolete patch and spurious lines from the spec file (#1347336) + * Sun Jun 26 2016 Elio Maldonado - 3.25.0-3 - Cleanup spec file and patches and add references to bugs filed upstream