[packages/gnutls] - added guile-rsa-export patch: disable guile code which relies on RSA_EXPORT code finally disabled

qboosh qboosh at pld-linux.org
Wed Mar 5 11:46:08 CET 2014


commit 2121e359cc0ec5d96ea908cc9b038ae9c9377133
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 5 11:48:53 2014 +0100

    - added guile-rsa-export patch: disable guile code which relies on RSA_EXPORT code finally disabled in 3.2.12

 gnutls-guile-rsa-export.patch | 55 +++++++++++++++++++++++++++++++++++++++++++
 gnutls.spec                   |  4 ++--
 2 files changed, 57 insertions(+), 2 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index e443e3d..2fdc604 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -14,6 +14,7 @@ Source0:	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/%{name}-%{version}.tar.lz
 # Source0-md5:	06de5fb89e5593e59a66039b11e7acc6
 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
@@ -44,8 +45,6 @@ Requires:	%{name}-libs = %{version}-%{release}
 %{?with_dane:Requires:	%{name}-dane = %{version}-%{release}}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		skip_post_check_so	guile-gnutls-v-.*.so.*
-
 %description
 GnuTLS is a project that aims to develop a library which provides a
 secure layer, over a reliable transport layer (ie. TCP/IP). Currently
@@ -204,6 +203,7 @@ Wiązania Guile do GnuTLS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/gnutls-guile-rsa-export.patch b/gnutls-guile-rsa-export.patch
new file mode 100644
index 0000000..f2e6f90
--- /dev/null
+++ b/gnutls-guile-rsa-export.patch
@@ -0,0 +1,55 @@
+--- 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
+ 

+ 
++#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
+ 

+ 
+ /* 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/2121e359cc0ec5d96ea908cc9b038ae9c9377133



More information about the pld-cvs-commit mailing list