Author: kengert
Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19306
Modified Files:
nss.spec
Added Files:
nss-pem-bug483855.patch
Log Message:
* Tue Mar 31 2009 Kai Engert <kaie(a)redhat.com> - 3.12.2.0-5
- add upstream patch to fix bug 483855
nss-pem-bug483855.patch:
--- NEW FILE nss-pem-bug483855.patch ---
diff -ruNp mozilla.orig/security/nss/lib/ckfw/pem/pobject.c
mozilla/security/nss/lib/ckfw/pem/pobject.c
--- mozilla.orig/security/nss/lib/ckfw/pem/pobject.c 2009-02-28 15:03:36.719964516 +0100
+++ mozilla/security/nss/lib/ckfw/pem/pobject.c 2009-02-28 15:03:55.964074075 +0100
@@ -987,10 +987,7 @@ pem_CreateObject
char *ivstring = NULL;
count = pem_nobjs;
- if (count > 0)
- size = ((count / PEM_ITEM_CHUNK) + 1) * PEM_ITEM_CHUNK;
- else
- size = 0;
+ size = (count / PEM_ITEM_CHUNK) * PEM_ITEM_CHUNK;
/*
* only create token objects
Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/nss.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- nss.spec 23 Jan 2009 05:39:22 -0000 1.57
+++ nss.spec 31 Mar 2009 23:09:04 -0000 1.58
@@ -5,7 +5,7 @@
Summary: Network Security Services
Name: nss
Version: 3.12.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL:
http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -33,6 +33,7 @@
Patch1: nss-no-rpath.patch
Patch2: nss-nolocalsql.patch
+Patch4: nss-pem-bug483855.patch
Patch5: nss-pem-bug429175.patch
Patch6: nss-enable-pem.patch
@@ -88,6 +89,7 @@
%patch1 -p0
%patch2 -p0
+%patch4 -p0 -b .483855
%patch5 -p0 -b .429175
%patch6 -p0 -b .libpem
@@ -446,6 +448,8 @@
%changelog
+* Tue Mar 31 2009 Kai Engert <kaie(a)redhat.com> - 3.12.2.0-5
+- add upstream patch to fix bug 483855
* Fri Jan 23 2009 Kai Engert <kengert(a)redhat.com> - 3.12.2.0-4
- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM
* Wed Oct 22 2008 Kai Engert <kaie(a)redhat.com> - 3.12.2.0-3