rpms/pygpgme/devel pygpgme-0.1-symmetric_encryption_support.patch, NONE, 1.1 pygpgme.spec, 1.14, 1.15

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/pygpgme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9902

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-symmetric_encryption_support.patch 
Log Message:
* Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.1-15.20090121bzr54
- Add a second patch from mitr for symmetric_encryption_support


pygpgme-0.1-symmetric_encryption_support.patch:
 pygpgme-context.c |   34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

--- NEW FILE pygpgme-0.1-symmetric_encryption_support.patch ---
--- pygpgme-0.1/src/pygpgme-context.c~  2008-11-06 15:33:57.000000000 +0100
+++ pygpgme-0.1/src/pygpgme-context.c   2008-11-06 15:35:35.000000000 +0100
@@ -468,25 +468,29 @@
                           &py_plain, &py_cipher))
         return NULL;
 
-    py_recp = PySequence_Fast(py_recp, "first argument must be a sequence");
-    if (py_recp == NULL)
-        return NULL;
+    if (py_recp == Py_None)
+        recp = NULL;
+    else {
+        py_recp = PySequence_Fast(py_recp, "first argument must be a sequence");
+        if (py_recp == NULL)
+            return NULL;
 
-    length = PySequence_Fast_GET_SIZE(py_recp);
-    recp = malloc((length + 1) * sizeof (gpgme_key_t));
-    for (i = 0; i < length; i++) {
-        PyObject *item = PySequence_Fast_GET_ITEM(py_recp, i);
+        length = PySequence_Fast_GET_SIZE(py_recp);
+        recp = malloc((length + 1) * sizeof (gpgme_key_t));
+        for (i = 0; i < length; i++) {
+            PyObject *item = PySequence_Fast_GET_ITEM(py_recp, i);
 
-        if (!PyObject_TypeCheck(item, &PyGpgmeKey_Type)) {
-            free(recp);
-            Py_DECREF(py_recp);
-            PyErr_SetString(PyExc_TypeError, "items in first argument must "
-                            "be gpgme.Key objects");
-            return NULL;
+            if (!PyObject_TypeCheck(item, &PyGpgmeKey_Type)) {
+                free(recp);
+                Py_DECREF(py_recp);
+                PyErr_SetString(PyExc_TypeError, "items in first argument must "
+                                "be gpgme.Key objects");
+                return NULL;
+            }
+            recp[i] = ((PyGpgmeKey *)item)->key;
         }
-        recp[i] = ((PyGpgmeKey *)item)->key;
+        recp[i] = NULL;
     }
-    recp[i] = NULL;
 
     if (pygpgme_data_new(&plain, py_plain)) {
         free(recp);



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pygpgme.spec	29 Jul 2009 00:08:06 -0000	1.14
+++ pygpgme.spec	29 Jul 2009 00:19:18 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        14.20090121bzr54%{?dist}
+Release:        15.20090121bzr54%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
@@ -23,6 +23,7 @@ Source0:        pygpgme-0.1.tar.gz
 #Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 Patch0:         pygpgme-0.1-py23.patch
 Patch1:         pygpgme-0.1-gpgme_ctx_set_engine_info.patch
+Patch2:         pygpgme-0.1-symmetric_encryption_support.patch
 # Patch to make generating a tarball (sdist) work.  Applied prior to creating
 # the Source0.
 Patch100:       pygpgme-examples.patch
@@ -41,6 +42,7 @@ the GPGME library.
 # Patch necessary for python version 2.3 and below.
 %patch0 -p1 -b .py23
 %patch1 -p1 -b .ctx_set_engine
+%patch2 -p1 -b .sym_encrypt
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.1-15.20090121bzr54
+- Add a second patch from mitr for symmetric_encryption_support
+
 * Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.1-14.20090121bzr54
 - Patch from mitr for gpgme_ctx_set_engine_info