[python-nss] add python-nss-0.12-rsapssparams.patch to fix build problem with nss >= 3.13

John Dennis jdennis at fedoraproject.org
Thu Nov 17 21:44:11 UTC 2011


commit 791a1a5bb26801bd570b9ffa0dc9692e014b6772
Author: John Dennis <jdennis at redhat.com>
Date:   Thu Nov 17 16:43:13 2011 -0500

    add python-nss-0.12-rsapssparams.patch to fix build problem
    with nss >= 3.13

 python-nss-0.12-rsapssparams.patch |   25 +++++++++++++++++++++++++
 python-nss.spec                    |   13 ++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/python-nss-0.12-rsapssparams.patch b/python-nss-0.12-rsapssparams.patch
new file mode 100644
index 0000000..cea6f1d
--- /dev/null
+++ b/python-nss-0.12-rsapssparams.patch
@@ -0,0 +1,25 @@
+RCS file: /cvsroot/mozilla/security/python/nss/src/py_nss.c,v
+retrieving revision 1.23
+diff -b -u -r1.23 py_nss.c
+--- src/py_nss.c	6 Jun 2011 15:21:13 -0000	1.23
++++ src/py_nss.c	17 Nov 2011 21:11:40 -0000
+@@ -4669,7 +4669,7 @@
+     }
+
+     if (params.hashAlg) {
+-        obj = oid_secitem_to_pystr_desc(&params->hashAlg->algorithm);
++        obj = oid_secitem_to_pystr_desc(&params.hashAlg->algorithm);
+     } else {
+         obj = PyString_FromString("default, SHA-1");
+     }
+@@ -4677,8 +4677,8 @@
+     Py_CLEAR(obj);
+
+     if (params.maskAlg) {
+-        obj = oid_secitem_to_pystr_desc(&params->maskAlg->algorithm);
+-        if (SEC_QuickDERDecodeItem(pool, &mask_hash_alg,
++        obj = oid_secitem_to_pystr_desc(&params.maskAlg->algorithm);
++        if (SEC_QuickDERDecodeItem(arena, &mask_hash_alg,
+                                    SEC_ASN1_GET(SECOID_AlgorithmIDTemplate),
+                                    &params.maskAlg->parameters) == SECSuccess) {
+             obj1 = oid_secitem_to_pystr_desc(&mask_hash_alg);
diff --git a/python-nss.spec b/python-nss.spec
index 47eb6c1..77ddd6a 100644
--- a/python-nss.spec
+++ b/python-nss.spec
@@ -6,7 +6,7 @@
 
 Name:           python-nss
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Network Security Services (NSS)
 
 Group:          Development/Languages
@@ -15,11 +15,13 @@ URL:            ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss
 Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss/releases/PYNSS_RELEASE_0_12_0/src/python-nss-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: python-nss-0.12-rsapssparams.patch
+
 %global docdir %{_docdir}/%{name}-%{version}
 
 # We don't want to provide private python extension libs
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_provides_in %{python_sitearch}/.*\.so$
 %filter_setup
 }
 
@@ -50,6 +52,7 @@ API documentation and examples
 
 %prep
 %setup -q
+%patch1 -b .rsapssparams
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{__python} setup.py build
@@ -91,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Nov 17 2011 John Dennis <jdennis at redhat.com> - 0.12-2
+- add patch python-nss-0.12-rsapssparams.patch to fix build problem
+  which appears only with nss 3.13 and later.
+
 * Mon Jun  6 2011 John Dennis <jdennis at redhat.com> - 0.12-1
   * Major new enhancement is additon of PKCS12 support and
     AlgorithmID's.
@@ -213,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
     - test/test_client_server.py
     - test/test_digest.py (replaces digest_test.py)
     - test/test_pkcs12.py
-	
+
   * The following were deprecated:
     - SignatureAlgorithm
 


More information about the scm-commits mailing list