Version: 3.2.12.1

RSA_EXPORT is back, no need for the gnutls-guile-rsa-export.patch hack.

diff --git a/gnutls-guile-rsa-export.patch b/gnutls-guile-rsa-export.patch
deleted file mode 100644 (file)
index f2e6f90..0000000
--- a/gnutls-guile-rsa-export.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- gnutls-3.2.12/guile/src/core.c.orig        2014-03-05 11:15:18.553666903 +0100
-+++ gnutls-3.2.12/guile/src/core.c     2014-03-05 11:15:22.743666728 +0100
-@@ -1314,6 +1314,7 @@
- #undef FUNC_NAME
- \f
- 
-+#ifdef ENABLE_RSA_EXPORT
- /* RSA parameters.  */
- 
- SCM_DEFINE (scm_gnutls_make_rsa_parameters, "make-rsa-parameters", 1, 0, 0,
-@@ -1413,6 +1414,7 @@
- }
- 
- #undef FUNC_NAME
-+#endif
- \f
- 
- /* Certificate credentials.  */
-@@ -1537,6 +1539,7 @@
- 
- #undef FUNC_NAME
- 
-+#ifdef ENABLE_RSA_EXPORT
- SCM_DEFINE (scm_gnutls_set_certificate_credentials_rsa_export_params_x,
-             "set-certificate-credentials-rsa-export-parameters!",
-             2, 0, 0,
-@@ -1558,6 +1561,7 @@
- }
- 
- #undef FUNC_NAME
-+#endif
- 
- SCM_DEFINE (scm_gnutls_set_certificate_credentials_x509_key_files_x,
-             "set-certificate-credentials-x509-key-files!",
---- gnutls-3.2.12/guile/modules/gnutls/build/smobs.scm.orig    2013-11-10 18:59:14.000000000 +0100
-+++ gnutls-3.2.12/guile/modules/gnutls/build/smobs.scm 2014-03-05 11:35:54.030281722 +0100
-@@ -169,10 +169,6 @@
-   (make-smob-type "gnutls_dh_params_t" 'dh-parameters
-                   "gnutls_dh_params_deinit"))
- 
--(define %rsa-parameters-smob
--  (make-smob-type "gnutls_rsa_params_t" 'rsa-parameters
--                  "gnutls_rsa_params_deinit"))
--
- (define %certificate-credentials-smob
-   (make-smob-type "gnutls_certificate_credentials_t" 'certificate-credentials
-                   "gnutls_certificate_free_credentials"))
-@@ -218,7 +214,6 @@
-   ;; All SMOB types.
-   (list %session-smob %anonymous-client-credentials-smob
-         %anonymous-server-credentials-smob %dh-parameters-smob
--        %rsa-parameters-smob
-         %certificate-credentials-smob
-         %srp-server-credentials-smob %srp-client-credentials-smob
-         %psk-server-credentials-smob %psk-client-credentials-smob

diff --git a/gnutls.spec b/gnutls.spec
index 2fdc6045789d2d09bb11343d5c8023a4f3806a6b..0347d968eba3fef626d99af902d689d080ac09f4 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -6,15 +6,14 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.2.12
+Version:       3.2.12.1
 Release:       1
 License:       LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/%{name}-%{version}.tar.lz
-# Source0-md5: 06de5fb89e5593e59a66039b11e7acc6
+# Source0-md5: c97f2c360fd955fb6a3da3f5abc55001
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
-Patch2:                %{name}-guile-rsa-export.patch
 URL:           http://www.gnutls.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.12.2
@@ -200,10 +199,9 @@ Guile bindings for GnuTLS.
 Wiązania Guile do GnuTLS.
 
 %prep
-%setup -q
+%setup -qn %{name}-3.2.12
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__rm} po/stamp-po