[Pkg-gnutls-commits] r1232 - in /packages/gnutls26/trunk/debian: changelog patches/18_gpgerrorinpkgconfig.diff patches/20_gcrypt15compat.diff patches/21_gnutls-cli.man.diff patches/23_deinit_privkey.diff patches/series

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sun Aug 28 16:34:20 UTC 2011


Author: ametzler
Date: Sun Aug 28 16:34:19 2011
New Revision: 1232

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1232
Log:
Drop superfluous patches , update 23_deinit_privkey.diff.

Removed:
    packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff
    packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/patches/18_gpgerrorinpkgconfig.diff
    packages/gnutls26/trunk/debian/patches/23_deinit_privkey.diff
    packages/gnutls26/trunk/debian/patches/series

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1232&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Aug 28 16:34:19 2011
@@ -4,6 +4,8 @@
   * New upstream version.
     + Uses p11-kit instead of forked pakchois for PKCS#11. Update
       build-depends (libp11-kit-dev and pkg-config) and debian/copyright.
+  * Drop superfluous patches (20_gcrypt15compat.diff,
+    21_gnutls-cli.man.diff), update 23_deinit_privkey.diff.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 28 Aug 2011 09:08:07 +0200
 

Modified: packages/gnutls26/trunk/debian/patches/18_gpgerrorinpkgconfig.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/18_gpgerrorinpkgconfig.diff?rev=1232&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/18_gpgerrorinpkgconfig.diff (original)
+++ packages/gnutls26/trunk/debian/patches/18_gpgerrorinpkgconfig.diff Sun Aug 28 16:34:19 2011
@@ -3,13 +3,14 @@
 Bug-Debian: http://bugs.debian.org/632891
 Forwarded: no (Upstream has switched to nettle as crypto backend)
 
---- gnutls26-2.12.7.orig/lib/gnutls.pc.in
-+++ gnutls26-2.12.7/lib/gnutls.pc.in
+diff -NurBbp gnutls-2.12.9/lib/gnutls.pc.in b/lib/gnutls.pc.in
+--- gnutls-2.12.9/lib/gnutls.pc.in	2011-07-27 16:03:24.000000000 +0200
++++ b/lib/gnutls.pc.in	2011-08-28 18:09:22.000000000 +0200
 @@ -20,6 +20,6 @@ Description: Transport Security Layer im
  URL: http://www.gnu.org/software/gnutls/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
-+Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ -lgpg-error
+-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
++Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ -lgpg-error @GNUTLS_ZLIB_LIBS_PRIVATE@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}

Modified: packages/gnutls26/trunk/debian/patches/23_deinit_privkey.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/23_deinit_privkey.diff?rev=1232&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/23_deinit_privkey.diff (original)
+++ packages/gnutls26/trunk/debian/patches/23_deinit_privkey.diff Sun Aug 28 16:34:19 2011
@@ -6,18 +6,19 @@
  2.10.x and do not require to hold the structures.
 Bug-Debian: http://bugs.debian.org/638595
 
---- gnutls26-2.12.7.orig/lib/gnutls_privkey.c
-+++ gnutls26-2.12.7/lib/gnutls_privkey.c
-@@ -266,7 +266,7 @@ gnutls_privkey_init (gnutls_privkey_t *
- void
- gnutls_privkey_deinit (gnutls_privkey_t key)
+diff -NurBbp gnutls-2.12.9/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
+--- gnutls-2.12.9/lib/gnutls_privkey.c	2011-08-01 18:05:23.000000000 +0200
++++ b/lib/gnutls_privkey.c	2011-08-28 18:19:56.000000000 +0200
+@@ -271,7 +271,7 @@ gnutls_privkey_deinit (gnutls_privkey_t
  {
+   if (key == NULL) return;
+ 
 -  if (key->flags & GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE)
 +  if (key->flags & GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE || key->flags & GNUTLS_PRIVKEY_IMPORT_COPY)
      switch (key->type)
        {
  #ifdef ENABLE_OPENPGP
-@@ -322,6 +322,9 @@ int ret;
+@@ -331,6 +331,9 @@ int ret;
        return ret;
      }
  
@@ -27,11 +28,10 @@
    pkey->key.pkcs11 = key;
    pkey->type = GNUTLS_PRIVKEY_PKCS11;
    pkey->pk_algorithm = gnutls_pkcs11_privkey_get_pk_algorithm (key, NULL);
-@@ -358,7 +361,22 @@ int ret;
-       return ret;
-     }
- 
--  pkey->key.x509 = key;
+@@ -369,7 +372,22 @@ int ret;
+       return ret;
+     }
+ 
 +  if (flags & GNUTLS_PRIVKEY_IMPORT_COPY)
 +    {
 +      ret = gnutls_x509_privkey_init(&pkey->key.x509);
@@ -46,16 +46,15 @@
 +        }
 +    }
 +  else
-+    pkey->key.x509 = key;
+   pkey->key.x509 = key;
 +
    pkey->type = GNUTLS_PRIVKEY_X509;
    pkey->pk_algorithm = gnutls_x509_privkey_get_pk_algorithm (key);
    pkey->flags = flags;
-@@ -398,7 +416,22 @@ uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]
-       return ret;
-     }
- 
--  pkey->key.openpgp = key;
+@@ -409,7 +427,22 @@ uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE]
+       return ret;
+     }
+ 
 +  if (flags & GNUTLS_PRIVKEY_IMPORT_COPY)
 +    {
 +      ret = gnutls_openpgp_privkey_init(&pkey->key.openpgp);
@@ -70,14 +69,15 @@
 +        }
 +    }
 +  else
-+    pkey->key.openpgp = key;
+   pkey->key.openpgp = key;
 +
    pkey->type = GNUTLS_PRIVKEY_OPENPGP;
    
    ret = gnutls_openpgp_privkey_get_preferred_key_id (key, keyid);
---- gnutls26-2.12.7.orig/lib/gnutls_x509.c
-+++ gnutls26-2.12.7/lib/gnutls_x509.c
-@@ -894,7 +894,7 @@ gnutls_certificate_set_x509_key (gnutls_
+diff -NurBbp gnutls-2.12.9/lib/gnutls_x509.c b/lib/gnutls_x509.c
+--- gnutls-2.12.9/lib/gnutls_x509.c	2011-08-17 16:48:28.000000000 +0200
++++ b/lib/gnutls_x509.c	2011-08-28 18:18:17.000000000 +0200
+@@ -969,7 +969,7 @@ gnutls_certificate_set_x509_key (gnutls_
        return ret;
      }
  
@@ -86,27 +86,9 @@
    if (ret < 0)
      {
        gnutls_assert ();
---- gnutls26-2.12.7.orig/lib/x509/x509.c
-+++ gnutls26-2.12.7/lib/x509/x509.c
-@@ -84,7 +84,7 @@ int
- _gnutls_x509_crt_cpy (gnutls_x509_crt_t dest, gnutls_x509_crt_t src)
- {
-   int ret;
--  size_t der_size;
-+  size_t der_size = 0;
-   opaque *der;
-   gnutls_datum_t tmp;
- 
-@@ -123,7 +123,6 @@ _gnutls_x509_crt_cpy (gnutls_x509_crt_t
-     }
- 
-   return 0;
--
- }
- 
- /**
---- gnutls26-2.12.7.orig/lib/includes/gnutls/abstract.h
-+++ gnutls26-2.12.7/lib/includes/gnutls/abstract.h
+diff -NurBbp gnutls-2.12.9/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
+--- gnutls-2.12.9/lib/includes/gnutls/abstract.h	2011-04-08 02:30:45.000000000 +0200
++++ b/lib/includes/gnutls/abstract.h	2011-08-28 18:18:17.000000000 +0200
 @@ -101,7 +101,8 @@ gnutls_privkey_get_preferred_hash_algori
  gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key);
  
@@ -117,8 +99,42 @@
  int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey,
                                    gnutls_pkcs11_privkey_t key,
                                    unsigned int flags);
---- gnutls26-2.12.7.orig/lib/openpgp/privkey.c
-+++ gnutls26-2.12.7/lib/openpgp/privkey.c
+diff -NurBbp gnutls-2.12.9/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
+--- gnutls-2.12.9/lib/openpgp/gnutls_openpgp.c	2011-08-17 16:48:28.000000000 +0200
++++ b/lib/openpgp/gnutls_openpgp.c	2011-08-28 18:18:17.000000000 +0200
+@@ -152,7 +152,7 @@ gnutls_certificate_set_openpgp_key (gnut
+   
+   ret =
+     gnutls_privkey_import_openpgp (privkey, pkey,
+-                                   GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
++                                   GNUTLS_PRIVKEY_IMPORT_COPY);
+   if (ret < 0)
+     {
+       gnutls_privkey_deinit (privkey);
+@@ -431,6 +431,7 @@ gnutls_certificate_set_openpgp_key_mem2
+   ret = gnutls_certificate_set_openpgp_key (res, crt, pkey);
+ 
+   gnutls_openpgp_crt_deinit (crt);
++  gnutls_openpgp_privkey_deinit (pkey);
+ 
+   return ret;
+ }
+diff -NurBbp gnutls-2.12.9/lib/openpgp/gnutls_openpgp.h b/lib/openpgp/gnutls_openpgp.h
+--- gnutls-2.12.9/lib/openpgp/gnutls_openpgp.h	2011-04-08 02:30:45.000000000 +0200
++++ b/lib/openpgp/gnutls_openpgp.h	2011-08-28 18:18:17.000000000 +0200
+@@ -34,6 +34,9 @@ _gnutls_openpgp_raw_privkey_to_gkey (gnu
+                                      const gnutls_datum_t * raw_key);
+ 
+ int
++_gnutls_openpgp_privkey_cpy (gnutls_openpgp_privkey_t dest, gnutls_openpgp_privkey_t src);
++
++int
+ _gnutls_openpgp_request_key (gnutls_session_t,
+                              gnutls_datum_t * ret,
+                              const gnutls_certificate_credentials_t cred,
+diff -NurBbp gnutls-2.12.9/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
+--- gnutls-2.12.9/lib/openpgp/privkey.c	2011-04-17 12:07:25.000000000 +0200
++++ b/lib/openpgp/privkey.c	2011-08-28 18:18:17.000000000 +0200
 @@ -75,6 +75,55 @@ gnutls_openpgp_privkey_deinit (gnutls_op
    gnutls_free (key);
  }
@@ -175,34 +191,15 @@
  /**
   * gnutls_openpgp_privkey_sec_param:
   * @key: a key structure
---- gnutls26-2.12.7.orig/lib/openpgp/gnutls_openpgp.c
-+++ gnutls26-2.12.7/lib/openpgp/gnutls_openpgp.c
-@@ -152,7 +152,7 @@ gnutls_certificate_set_openpgp_key (gnut
-   
-   ret =
-     gnutls_privkey_import_openpgp (privkey, pkey,
--                                   GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
-+                                   GNUTLS_PRIVKEY_IMPORT_COPY);
-   if (ret < 0)
-     {
-       gnutls_privkey_deinit (privkey);
-@@ -431,6 +431,7 @@ gnutls_certificate_set_openpgp_key_mem2
-   ret = gnutls_certificate_set_openpgp_key (res, crt, pkey);
- 
-   gnutls_openpgp_crt_deinit (crt);
-+  gnutls_openpgp_privkey_deinit (pkey);
- 
-   return ret;
- }
---- gnutls26-2.12.7.orig/lib/openpgp/gnutls_openpgp.h
-+++ gnutls26-2.12.7/lib/openpgp/gnutls_openpgp.h
-@@ -34,6 +34,9 @@ _gnutls_openpgp_raw_privkey_to_gkey (gnu
-                                      const gnutls_datum_t * raw_key);
- 
- int
-+_gnutls_openpgp_privkey_cpy (gnutls_openpgp_privkey_t dest, gnutls_openpgp_privkey_t src);
-+
-+int
- _gnutls_openpgp_request_key (gnutls_session_t,
-                              gnutls_datum_t * ret,
-                              const gnutls_certificate_credentials_t cred,
+diff -NurBbp gnutls-2.12.9/lib/x509/x509.c b/lib/x509/x509.c
+--- gnutls-2.12.9/lib/x509/x509.c	2011-07-31 21:13:42.000000000 +0200
++++ b/lib/x509/x509.c	2011-08-28 18:18:17.000000000 +0200
+@@ -84,7 +84,7 @@ int
+ _gnutls_x509_crt_cpy (gnutls_x509_crt_t dest, gnutls_x509_crt_t src)
+ {
+   int ret;
+-  size_t der_size;
++  size_t der_size = 0;
+   opaque *der;
+   gnutls_datum_t tmp;
+ 

Modified: packages/gnutls26/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/series?rev=1232&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/series (original)
+++ packages/gnutls26/trunk/debian/patches/series Sun Aug 28 16:34:19 2011
@@ -2,8 +2,6 @@
 16_unnecessarydep.diff
 17_ignoretestsuitteerrors.diff
 18_gpgerrorinpkgconfig.diff
-20_gcrypt15compat.diff
-21_gnutls-cli.man.diff
 22_export_gnutls_openpgp_privkey_sign_hash.diff
 23_deinit_privkey.diff
 24_XmppAddr-UTF8String.diff




More information about the Pkg-gnutls-commits mailing list