rpms/nss
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f13' into f14

Browse Source 
Fix unclosed comment in renegotiate-transitional.patch
This commit is contained in:
Elio Maldonado 2010-09-07 08:19:12 -07:00
commit 9c7cfa3932
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nss.spec
View File

@ -1,14 +1,14 @@
%global nspr_version 4.8.6 %global nspr_version 4.8.6
%global nss_util_version 3.12.7 %global nss_util_version 3.12.7
%global nss_util_build_version 3.12.6 %global nss_util_build_version 3.12.6
%global nss_softokn_version 3.12.6 %global nss_softokn_version 3.12.7
%global nss_softokn_build_version 3.12.6 %global nss_softokn_build_version 3.12.6
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.7 Version: 3.12.7
Release: 3%{?dist} Release: 4%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -491,13 +491,15 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckfw.a %{_libdir}/libnssckfw.a
%changelog %changelog
* Mon Sep 07 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-4
- Fix unclosed comment in renegotiate-transitional.patch
* Sat Aug 28 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-3 * Sat Aug 28 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-3
- Change BuildRequries to available version of nss-util-devel - Change BuildRequries to available version of nss-util-devel
%changelog
* Sat Aug 28 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-2 * Sat Aug 28 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-2
- Define NSS_USE_SYSTEM_SQLITE and remove unneeded patch - Define NSS_USE_SYSTEM_SQLITE and remove unneeded patch
- Add comments regarding an unverioned provides which triggers rpmlint warning - Add comments regarding an unversioned provides which triggers rpmlint warning
- Build requires nss-softokn-devel >= 3.12.7 - Build requires nss-softokn-devel >= 3.12.7
* Mon Aug 16 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-1 * Mon Aug 16 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-1

2
renegotiate-transitional.patch
View File

@ -10,7 +10,7 @@ diff -u -p -r1.66 sslsock.c
PR_FALSE, /* enableSessionTickets */ PR_FALSE, /* enableSessionTickets */
PR_FALSE, /* enableDeflate */ PR_FALSE, /* enableDeflate */
- 2, /* enableRenegotiation (default: requires extension) */ - 2, /* enableRenegotiation (default: requires extension) */
+ 3, /* enableRenegotiation (default: transitional) + 3, /* enableRenegotiation (default: transitional) */
PR_FALSE, /* requireSafeNegotiation */ PR_FALSE, /* requireSafeNegotiation */
}; };