[Pkg-gnutls-commits] r550 - in /packages/gnutls26/branches/branch2.3.x/debian: changelog patches/15_gnutls-pgpself.diff

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Wed Jun  4 18:01:21 2008
New Revision: 550

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=550
Log:
Add 15_gnutls-pgpself.diff (Pulled from upstream GIT), fixing testsuite failure on sparc.

Added:
    packages/gnutls26/branches/branch2.3.x/debian/patches/15_gnutls-pgpself.diff
Modified:
    packages/gnutls26/branches/branch2.3.x/debian/changelog

Modified: packages/gnutls26/branches/branch2.3.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.3.x/debian/changelog?rev=550&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.3.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.3.x/debian/changelog Wed Jun  4 18:01:21 2008
@@ -2,6 +2,8 @@
 
   * unreleased
   * Ship doc/certtool.cfg in /usr/share/doc/gnutls-bin/examples. Closes: #483798
+  * Add 15_gnutls-pgpself.diff (Pulled from upstream GIT), fixing testsuite
+    failure on sparc.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 24 May 2008 09:36:33 +0200
 

Added: packages/gnutls26/branches/branch2.3.x/debian/patches/15_gnutls-pgpself.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.3.x/debian/patches/15_gnutls-pgpself.diff?rev=550&op=file
==============================================================================
--- packages/gnutls26/branches/branch2.3.x/debian/patches/15_gnutls-pgpself.diff (added)
+++ packages/gnutls26/branches/branch2.3.x/debian/patches/15_gnutls-pgpself.diff Wed Jun  4 18:01:21 2008
@@ -1,0 +1,50 @@
+commit 12376a5162ad880bd500438f479167054678b366
+Author: Nikos Mavrogiannopoulos <nmav at crystal.(none)>
+Date:   Wed Jun 4 19:52:46 2008 +0300
+
+    safer copying of keyid type.
+
+diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
+index 8df59f3..02834f7 100644
+--- a/lib/openpgp/pgp.c
++++ b/lib/openpgp/pgp.c
+@@ -1461,7 +1461,7 @@ gnutls_openpgp_crt_get_preferred_key_id (gnutls_openpgp_crt_t key,
+       return GNUTLS_E_INVALID_REQUEST;
+     }
+
+-  memcpy( keyid, key->preferred_keyid, sizeof(keyid));
++  memcpy( keyid, key->preferred_keyid, sizeof(gnutls_openpgp_keyid_t));
+
+   return 0;
+ }
+@@ -1497,7 +1497,7 @@ int ret;
+     }
+
+   key->preferred_set = 1;
+-  memcpy( key->preferred_keyid, keyid, sizeof(keyid));
++  memcpy( key->preferred_keyid, keyid, sizeof(gnutls_openpgp_keyid_t));
+
+   return 0;
+ }
+diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
+index 012ce15..5a7e2d5 100644
+--- a/lib/openpgp/privkey.c
++++ b/lib/openpgp/privkey.c
+@@ -1059,7 +1059,7 @@ gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t key,
+       return GNUTLS_E_INVALID_REQUEST;
+     }
+
+-  memcpy( keyid, key->preferred_keyid, sizeof(keyid));
++  memcpy( keyid, key->preferred_keyid, sizeof(gnutls_openpgp_keyid_t));
+
+   return 0;
+ }
+@@ -1096,7 +1096,7 @@ gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key,
+     }
+
+   key->preferred_set = 1;
+-  memcpy( key->preferred_keyid, keyid, sizeof(keyid));
++  memcpy( key->preferred_keyid, keyid, sizeof(gnutls_openpgp_keyid_t));
+
+   return 0;
+ }