Browse Source

fix build with latest gnutls

Waldemar Brodkorb 9 years ago
parent
commit
bc0f2415c7

+ 1 - 1
package/samba/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		4.2.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_HASH:=		37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs

+ 11 - 0
package/samba/patches/patch-source4_lib_tls_tls_c

@@ -0,0 +1,11 @@
+--- samba-4.2.1.orig/source4/lib/tls/tls.c	2014-10-01 11:16:21.000000000 +0200
++++ samba-4.2.1/source4/lib/tls/tls.c	2015-05-13 08:33:06.000000000 +0200
+@@ -598,7 +598,7 @@ struct socket_context *tls_init_client(s
+ 	gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM);
+ 	TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT));
+ 	TLSCHECK(gnutls_set_default_priority(tls->session));
+-	gnutls_certificate_type_set_priority(tls->session, cert_type_priority);
++	//gnutls_certificate_type_set_priority(tls->session, cert_type_priority);
+ 	TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred));
+ 
+ 	talloc_set_destructor(tls, tls_destructor);

+ 11 - 0
package/samba/patches/patch-source4_lib_tls_tls_tstream_c

@@ -0,0 +1,11 @@
+--- samba-4.2.1.orig/source4/lib/tls/tls_tstream.c	2014-10-01 11:16:21.000000000 +0200
++++ samba-4.2.1/source4/lib/tls/tls_tstream.c	2015-05-13 08:33:16.000000000 +0200
+@@ -1014,7 +1014,7 @@ struct tevent_req *_tstream_tls_connect_
+ 		return tevent_req_post(req, ev);
+ 	}
+ 
+-	gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority);
++	//gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority);
+ 
+ 	ret = gnutls_credentials_set(tlss->tls_session,
+ 				     GNUTLS_CRD_CERTIFICATE,