diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-13 15:28:04 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-13 22:27:47 +0200 |
| commit | bc0f2415c71d8ee0e9b04e32aab47797d3c80024 (patch) | |
| tree | 7df46aecf559a2e3b62c5961b21febc9f859a82d /package/samba | |
| parent | ac9e82dc72cc92dad4cdf006837d10fc21edbb5d (diff) | |
fix build with latest gnutls
Diffstat (limited to 'package/samba')
| -rw-r--r-- | package/samba/Makefile | 2 | ||||
| -rw-r--r-- | package/samba/patches/patch-source4_lib_tls_tls_c | 11 | ||||
| -rw-r--r-- | package/samba/patches/patch-source4_lib_tls_tls_tstream_c | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile index e37e0f979..34bc29045 100644 --- a/package/samba/Makefile +++ b/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 diff --git a/package/samba/patches/patch-source4_lib_tls_tls_c b/package/samba/patches/patch-source4_lib_tls_tls_c new file mode 100644 index 000000000..f473f4ca0 --- /dev/null +++ b/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); diff --git a/package/samba/patches/patch-source4_lib_tls_tls_tstream_c b/package/samba/patches/patch-source4_lib_tls_tls_tstream_c new file mode 100644 index 000000000..dfef22004 --- /dev/null +++ b/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, |