rpms/nss/devel sources, 1.29, 1.30 .cvsignore, 1.27, 1.28 nss.spec, 1.124, 1.125

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7972

Modified Files:
	sources .cvsignore nss.spec 
Log Message:
Update to 3.12.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	7 Sep 2009 19:16:20 -0000	1.29
+++ sources	3 Dec 2009 22:13:38 -0000	1.30
@@ -1,2 +1,2 @@
-954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
 895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	7 Sep 2009 19:16:35 -0000	1.27
+++ .cvsignore	3 Dec 2009 22:13:38 -0000	1.28
@@ -1,2 +1,2 @@
-nss-3.12.4-stripped.tar.bz2
+nss-3.12.5-stripped.tar.bz2
 nss-pem-20090907.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- nss.spec	20 Nov 2009 17:49:08 -0000	1.124
+++ nss.spec	3 Dec 2009 22:13:38 -0000	1.125
@@ -1,18 +1,19 @@
 %global nspr_version 4.8
-%global nss_util_version 3.12.4
+%global nss_util_version 3.12.5
 %global nss_softokn_version 3.12.4
+%global nss_softokn_fips_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.4
-Release:          17%{?dist}
+Version:          3.12.5
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
-Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
+Requires:         nss-softokn%{_isa} = %{nss_softokn_fips_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
@@ -39,8 +40,7 @@ Source12:         %{name}-pem-20090907.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           newargs.patch
-Patch8:           sysinit.patch
+Patch7:           533125-ammend.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -106,8 +106,7 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .newargs
-%patch8 -p0 -b .sysinit
+%patch7 -p0 -b .533125-ammend
 
 %build
 
@@ -469,6 +468,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1
+- Update to 3.12.5
+- Patch to allow ssl/tls clients to interoperate with servers that require renogiation
+
 * Fri Nov 20 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-14.1
 - Retagging