[packages/libggz] - updated gnutls patch to fix build with gnutls 3.4+
qboosh
qboosh at pld-linux.org
Sun Feb 5 21:22:08 CET 2017
commit d5f0858c1aa95298f95187f81e8d51ae8c5675b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 5 21:23:45 2017 +0100
- updated gnutls patch to fix build with gnutls 3.4+
libggz-gnutls.patch | 48 ++++++++++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 12 deletions(-)
---
diff --git a/libggz-gnutls.patch b/libggz-gnutls.patch
index 4ade5f6..f47d026 100644
--- a/libggz-gnutls.patch
+++ b/libggz-gnutls.patch
@@ -1,15 +1,39 @@
---- libggz-0.0.14.1/src/security/ggz_tls_gnutls.c~ 2008-01-05 20:03:41.000000000 +0100
-+++ libggz-0.0.14.1/src/security/ggz_tls_gnutls.c 2011-09-11 21:24:48.507118718 +0200
-@@ -56,7 +56,11 @@
- const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
- const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
- const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
-+const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB,
-+#ifdef GNUTLS_COMP_LZO
-+ GNUTLS_COMP_LZO,
-+#endif
-+ 0};
+--- libggz-0.0.14.1/src/security/ggz_tls_gnutls.c.orig 2017-02-05 20:49:57.460153979 +0100
++++ libggz-0.0.14.1/src/security/ggz_tls_gnutls.c 2017-02-05 21:10:37.360139823 +0100
+@@ -52,12 +52,6 @@
+ static gnutls_anon_client_credentials c_cred;
+ static gnutls_dh_params params;
+-const int cipher_priority[] = {GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_NULL, GNUTLS_CIPHER_ARCFOUR_40, GNUTLS_CIPHER_ARCFOUR_128, 0};
+-const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
+-const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
+-const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
+-
void ggz_tls_init(const char *certfile, const char *keyfile, const char *password)
{
+ /* no cert support yet */
+@@ -113,22 +103,7 @@
+ else
+ gnutls_init(&session, GNUTLS_SERVER);
+
+- if(whoami == GGZ_TLS_CLIENT) {
+- /*gnutls_set_default_priority(session);*/
+- gnutls_mac_set_priority(session, mac_priority);
+- gnutls_kx_set_priority(session, kx_priority);
+- gnutls_protocol_set_priority(session, protocol_priority);
+- gnutls_compression_set_priority(session, compression_priority);
+- gnutls_cipher_set_priority(session, cipher_priority);
+- }
+- else {
+- /*gnutls_set_default_priority(session);*/
+- gnutls_protocol_set_priority(session, protocol_priority);
+- gnutls_compression_set_priority(session, compression_priority);
+- gnutls_cipher_set_priority(session, cipher_priority);
+- gnutls_mac_set_priority(session, mac_priority);
+- gnutls_kx_set_priority(session, kx_priority);
+- }
++ gnutls_set_default_priority(session);
+
+ /*gnutls_dh_set_prime_bits(session, 512);*/
+ if(whoami == GGZ_TLS_CLIENT) sleep(1);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libggz.git/commitdiff/d5f0858c1aa95298f95187f81e8d51ae8c5675b2
More information about the pld-cvs-commit
mailing list