[packages/samba] - updated to 4.2.4 - removed obsolete lib-tls-fix-build-with-gnutls-3.4 patch
qboosh
qboosh at pld-linux.org
Sat Sep 19 19:15:56 CEST 2015
commit 08caf7293450e48e33e0dd6a5e8a90c30f3fa70d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Sep 19 19:16:48 2015 +0200
- updated to 4.2.4
- removed obsolete lib-tls-fix-build-with-gnutls-3.4 patch
samba-lib-tls-fix-build-with-gnutls-3.4.patch | 74 ---------------------------
samba.spec | 12 ++---
2 files changed, 5 insertions(+), 81 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index d6f98aa..c74b289 100644
--- a/samba.spec
+++ b/samba.spec
@@ -11,8 +11,8 @@
%define ldb_ver 1.1.20
%define ntdb_ver 1.0
%define talloc_ver 2:2.1.2
-%define tdb_ver 2:1.3.4
-%define tevent_ver 0.9.24
+%define tdb_ver 2:1.3.6
+%define tevent_ver 0.9.25
%endif
%include /usr/lib/rpm/macros.perl
@@ -22,13 +22,13 @@
Summary: Samba Active Directory and SMB server
Summary(pl.UTF-8): Serwer Samba Active Directory i SMB
Name: samba
-Version: 4.2.2
+Version: 4.2.4
Release: 1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5: 77f138cc0736549b03872279364766e0
+# Source0-md5: fc0375018c820b4b794e1b632d69a6d5
Source1: smb.init
Source2: samba.pamd
Source4: samba.sysconfig
@@ -47,8 +47,7 @@ Patch4: unicodePwd-nthash-values-over-LDAP.patch
Patch5: %{name}-heimdal.patch
Patch6: server-role.patch
Patch7: %{name}-bug-9816.patch
-Patch8: %{name}-lib-tls-fix-build-with-gnutls-3.4.patch
-URL: http://www.samba.org/
+URL: https://www.samba.org/
BuildRequires: acl-devel
%{?with_avahi:BuildRequires: avahi-devel}
BuildRequires: ceph-devel >= 0.73
@@ -510,7 +509,6 @@ Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%{__sed} -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
%{__sed} -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
diff --git a/samba-lib-tls-fix-build-with-gnutls-3.4.patch b/samba-lib-tls-fix-build-with-gnutls-3.4.patch
deleted file mode 100644
index 16f928b..0000000
--- a/samba-lib-tls-fix-build-with-gnutls-3.4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 33379031e66330c453bd5af201c2ddca3dd16a2c Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Mon, 13 Apr 2015 23:11:14 +0300
-Subject: [PATCH] s4:lib/tls: fix build with gnutls 3.4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gnutls_certificate_type_set_priority() was removed in GnuTLS 3.4.0. Use
-gnutls_priority_set_direct instead.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=8780
-
-Signed-off-by: Björn Jacke <bj at sernet.de>
-Reviewed-By: Jelmer Vernooij <jelmer at samba.org>
-
-Autobuild-User(master): Björn Jacke <bj at sernet.de>
-Autobuild-Date(master): Wed Apr 29 22:29:02 CEST 2015 on sn-devel-104
-
-(cherry picked from commit c6ad8a10c12c8a79dc83cab1591e5279edd62bd6)
----
- source4/lib/tls/tls.c | 3 +--
- source4/lib/tls/tls_tstream.c | 7 +------
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
-index 9a3e610..7a7a7cd 100644
---- a/source4/lib/tls/tls.c
-+++ b/source4/lib/tls/tls.c
-@@ -572,7 +572,6 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx,
- {
- struct tls_context *tls;
- int ret = 0;
-- const int cert_type_priority[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
- struct socket_context *new_sock;
- NTSTATUS nt_status;
-
-@@ -598,7 +597,7 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx,
- 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_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL);
- TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred));
-
- talloc_set_destructor(tls, tls_destructor);
-diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
-index 2cb75ed..b907d0a 100644
---- a/source4/lib/tls/tls_tstream.c
-+++ b/source4/lib/tls/tls_tstream.c
-@@ -967,11 +967,6 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
- #if ENABLE_GNUTLS
- struct tstream_tls *tlss;
- int ret;
-- static const int cert_type_priority[] = {
-- GNUTLS_CRT_X509,
-- GNUTLS_CRT_OPENPGP,
-- 0
-- };
- #endif /* ENABLE_GNUTLS */
-
- req = tevent_req_create(mem_ctx, &state,
-@@ -1014,7 +1009,7 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
- return tevent_req_post(req, ev);
- }
-
-- gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority);
-+ gnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);
-
- ret = gnutls_credentials_set(tlss->tls_session,
- GNUTLS_CRD_CERTIFICATE,
---
-2.3.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/08caf7293450e48e33e0dd6a5e8a90c30f3fa70d
More information about the pld-cvs-commit
mailing list