← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnupg2/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/03-gpgsm-realloc.diff

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03-gpgsm-realloc.diff
1
 
--- a/kbx/keybox-blob.c   (revision 5367)
2
 
+++ b/kbx/keybox-blob.c   (working copy)
3
 
@@ -898,6 +898,7 @@
4
 
               rc = gpg_error_from_syserror ();
5
 
               goto leave;
6
 
             }
7
 
+          names = tmp;
8
 
         }
9
 
       names[blob->nuids++] = p;
10
 
       if (!i && (p=x509_email_kludge (p)))
11