diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-16 02:39:28 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-16 02:44:48 -0500 |
| commit | d86369b88a24dcc6c871dbffef070817cde41222 (patch) | |
| tree | 557cdfabcf34fa35955161059ad501eccbf1fbc2 | |
| parent | 28b7e21931f711d3df968e289ff49e8441876df4 (diff) | |
update samba to latest
| -rw-r--r-- | package/samba/Makefile | 4 | ||||
| -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, 2 insertions, 24 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile index c58909e40..3ecbc6bdf 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba -PKG_VERSION:= 4.2.2 +PKG_VERSION:= 4.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 27d6c69dc3afee38fd28051001d2d4bdae38c567612a9ec6477bb5567e2abc1e +PKG_HASH:= b6dfa5ae4818d891ee2fcff04a5912f4a4fb2394b4f5e66a2a15b428da094c7c PKG_DESCR:= file and print server (version 4) PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext-tiny util-linux popt python2 gnutls diff --git a/package/samba/patches/patch-source4_lib_tls_tls_c b/package/samba/patches/patch-source4_lib_tls_tls_c deleted file mode 100644 index f473f4ca0..000000000 --- a/package/samba/patches/patch-source4_lib_tls_tls_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index dfef22004..000000000 --- a/package/samba/patches/patch-source4_lib_tls_tls_tstream_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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, |