[Packages] libs/gnutls: Update to 2.2.3 (#3421)

[openwrt/svn-archive/archive.git] / libs / gnutls / patches / 002-disable_openpgp.patch

diff --git a/libs/gnutls/patches/002-disable_openpgp.patch b/libs/gnutls/patches/002-disable_openpgp.patch
index d482f34f5a77452a21cb05109445e6a053085670..f8bb535bbd3da0d1a99d27a68b75b2e989c1d362 100644 (file)
--- a/libs/gnutls/patches/002-disable_openpgp.patch
+++ b/libs/gnutls/patches/002-disable_openpgp.patch
@@ -1,21 +1,20 @@
-diff -ruN gnutls-2.0.0-old/libextra/gnutls_extra.c gnutls-2.0.0-new/libextra/gnutls_extra.c
---- gnutls-2.0.0-old/libextra/gnutls_extra.c   2007-05-26 20:43:24.000000000 +0200
-+++ gnutls-2.0.0-new/libextra/gnutls_extra.c   2007-09-09 13:36:21.000000000 +0200
-@@ -140,6 +140,8 @@
+Index: gnutls-2.2.3/libextra/gnutls_extra.c
+===================================================================
+--- gnutls-2.2.3.orig/libextra/gnutls_extra.c  2008-05-08 21:18:29.000000000 +0200
++++ gnutls-2.2.3/libextra/gnutls_extra.c       2008-05-08 21:18:29.000000000 +0200
+@@ -137,6 +137,7 @@
      }
  #endif
  
 +#ifdef ENABLE_OPENPGP
-+
    /* Register the openpgp functions. This is because some
     * of them are defined to be NULL in the main library.
     */
-@@ -155,6 +157,8 @@
-                                gnutls_openpgp_key_deinit,
+@@ -152,6 +153,7 @@
+                                gnutls_openpgp_crt_deinit,
+                                gnutls_openpgp_keyring_deinit,
                                 gnutls_openpgp_privkey_deinit);
++#endif
  
-+#endif /* ENABLE_OPENPGP */
-+
    return 0;
  }
-