Günther Deschner
parent
581f0ad413
commit
b15ae90556
|
|
@ -70,3 +70,4 @@ samba-3.6.0pre1.tar.gz
|
|||
/samba-4.4.6.tar.xz
|
||||
/samba-4.4.7.tar.xz
|
||||
/samba-4.4.8.tar.xz
|
||||
/samba-4.4.9.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
From 730c0a2fab4b0c494122f29355068cc2bbf0f672 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Adam <obnox@samba.org>
|
||||
Date: Fri, 21 Oct 2016 00:15:06 +0200
|
||||
Subject: [PATCH] vfs:glusterfs: preallocate result for glfs_realpath
|
||||
|
||||
https://bugzilla.samba.org/show_bug.cgi?id=12404
|
||||
|
||||
This makes us independent of the allocation
|
||||
method used inside glfs_realpath.
|
||||
|
||||
Signed-off-by: Michael Adam <obnox@samba.org>
|
||||
Reviewed-by: Ira Cooper <ira@samba.org>
|
||||
|
||||
Autobuild-User(master): Jeremy Allison <jra@samba.org>
|
||||
Autobuild-Date(master): Sat Oct 22 00:28:41 CEST 2016 on sn-devel-144
|
||||
|
||||
(cherry picked from commit 92a0a56c3852726e0812d260e043957c879aefa4)
|
||||
---
|
||||
source3/modules/vfs_glusterfs.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
|
||||
index 732ca51..fc40a90 100644
|
||||
--- a/source3/modules/vfs_glusterfs.c
|
||||
+++ b/source3/modules/vfs_glusterfs.c
|
||||
@@ -1036,7 +1036,20 @@ static int vfs_gluster_fallocate(struct vfs_handle_struct *handle,
|
||||
static char *vfs_gluster_realpath(struct vfs_handle_struct *handle,
|
||||
const char *path)
|
||||
{
|
||||
- return glfs_realpath(handle->data, path, 0);
|
||||
+ char *result = NULL;
|
||||
+ char *resolved_path = SMB_MALLOC_ARRAY(char, PATH_MAX+1);
|
||||
+
|
||||
+ if (resolved_path == NULL) {
|
||||
+ errno = ENOMEM;
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ result = glfs_realpath(handle->data, path, resolved_path);
|
||||
+ if (result == NULL) {
|
||||
+ SAFE_FREE(resolved_path);
|
||||
+ }
|
||||
+
|
||||
+ return result;
|
||||
}
|
||||
|
||||
static bool vfs_gluster_lock(struct vfs_handle_struct *handle,
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From bb64c550ae19b08ad4e6d8d26f68c2474cb251e6 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Metzmacher <metze@samba.org>
|
||||
Date: Tue, 19 Jul 2016 16:31:01 +0200
|
||||
Subject: [PATCH] krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_*
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
MIT only defined this as CKSUMTYPE_HMAC_SHA1_96_AES128,
|
||||
while Heimdal has CKSUMTYPE_HMAC_SHA1_96_AES_128.
|
||||
|
||||
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
||||
Reviewed-by: Günther Deschner <gd@samba.org>
|
||||
---
|
||||
lib/krb5_wrap/krb5_samba.h | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
|
||||
index 41664f1..2b5e2bb 100644
|
||||
--- a/lib/krb5_wrap/krb5_samba.h
|
||||
+++ b/lib/krb5_wrap/krb5_samba.h
|
||||
@@ -74,6 +74,17 @@
|
||||
#define CKSUMTYPE_HMAC_MD5 CKSUMTYPE_HMAC_MD5_ARCFOUR
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * CKSUMTYPE_HMAC_SHA1_96_AES_* in Heimdal
|
||||
+ * CKSUMTYPE_HMAC_SHA1_96_AES* in MIT
|
||||
+ */
|
||||
+#if defined(CKSUMTYPE_HMAC_SHA1_96_AES128) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_128)
|
||||
+#define CKSUMTYPE_HMAC_SHA1_96_AES_128 CKSUMTYPE_HMAC_SHA1_96_AES128
|
||||
+#endif
|
||||
+#if defined(CKSUMTYPE_HMAC_SHA1_96_AES256) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_256)
|
||||
+#define CKSUMTYPE_HMAC_SHA1_96_AES_256 CKSUMTYPE_HMAC_SHA1_96_AES256
|
||||
+#endif
|
||||
+
|
||||
typedef struct {
|
||||
#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
|
||||
krb5_address **addrs;
|
||||
--
|
||||
2.9.3
|
||||
|
||||
43
samba.spec
43
samba.spec
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
%define main_release 0
|
||||
|
||||
%define samba_version 4.4.8
|
||||
%define samba_version 4.4.9
|
||||
%define talloc_version 2.1.6
|
||||
%define tdb_version 1.3.8
|
||||
%define tevent_version 0.9.28
|
||||
|
|
@ -108,8 +108,6 @@ Source200: README.dc
|
|||
Source201: README.downgrade
|
||||
|
||||
Patch0: samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
||||
Patch1: samba-4.4.7-vfs_gluster_realpath.patch
|
||||
Patch2: samba-4.4.9-krb5_cksumtype_checks.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
|
|
@ -693,8 +691,6 @@ and use CTDB instead.
|
|||
%setup -q -n samba-%{version}%{pre_release}
|
||||
|
||||
%patch0 -p 1 -b .samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
||||
%patch1 -p 1 -b .samba-4.4.7-vfs_gluster_realpath.patch
|
||||
%patch2 -p 1 -b .samba-4.4.9-krb5_cksumtype_checks.patch
|
||||
|
||||
%build
|
||||
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
|
||||
|
|
@ -1979,27 +1975,30 @@ rm -rf %{buildroot}
|
|||
%{_libexecdir}/ctdb/tests/srvid_test
|
||||
%{_bindir}/ctdb_run_tests
|
||||
%{_bindir}/ctdb_run_cluster_tests
|
||||
%dir %{_datadir}/ctdb-tests
|
||||
%dir %{_datadir}/ctdb-tests/eventscripts
|
||||
%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/events.d
|
||||
%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/functions
|
||||
%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/nfs-checks.d
|
||||
%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout
|
||||
%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/statd-callout
|
||||
%dir %{_datadir}/ctdb-tests/onnode
|
||||
%{_datadir}/ctdb-tests/onnode/functions
|
||||
%dir %{_datadir}/ctdb-tests/scripts
|
||||
%{_datadir}/ctdb-tests/scripts/common.sh
|
||||
%{_datadir}/ctdb-tests/scripts/integration.bash
|
||||
%{_datadir}/ctdb-tests/scripts/test_wrap
|
||||
%{_datadir}/ctdb-tests/scripts/unit.sh
|
||||
%dir %{_datadir}/ctdb-tests/simple
|
||||
%{_datadir}/ctdb-tests/simple/functions
|
||||
%{_datadir}/ctdb-tests/simple/nodes
|
||||
%dir %{_datadir}/ctdb/tests
|
||||
%dir %{_datadir}/ctdb/tests/eventscripts
|
||||
%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/events.d
|
||||
%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/functions
|
||||
%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-checks.d
|
||||
%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout
|
||||
%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/statd-callout
|
||||
%dir %{_datadir}/ctdb/tests/onnode
|
||||
%{_datadir}/ctdb/tests/onnode/functions
|
||||
%dir %{_datadir}/ctdb/tests/scripts
|
||||
%{_datadir}/ctdb/tests/scripts/common.sh
|
||||
%{_datadir}/ctdb/tests/scripts/integration.bash
|
||||
%{_datadir}/ctdb/tests/scripts/test_wrap
|
||||
%{_datadir}/ctdb/tests/scripts/unit.sh
|
||||
%dir %{_datadir}/ctdb/tests/simple
|
||||
%{_datadir}/ctdb/tests/simple/functions
|
||||
%{_datadir}/ctdb/tests/simple/nodes
|
||||
%doc ctdb/tests/README
|
||||
%endif # with_clustering_support
|
||||
|
||||
%changelog
|
||||
* Wed Jan 04 2017 Guenther Deschner <gdeschner@redhat.com> - 4.4.9-0
|
||||
- Update to Samba 4.4.9
|
||||
|
||||
* Mon Dec 19 2016 Guenther Deschner <gdeschner@redhat.com> - 4.4.8-0
|
||||
- Update to Samba 4.4.8
|
||||
- resolves: #1405984 - CVE-2016-2123,CVE-2016-2125 and CVE-2016-2126
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (samba-4.4.8.tar.xz) = be0657e804d581e42f8b68fefc530ce31b11c74d56fa37e9997d174a557c5e08128f50c0d6489f09d0f455f2913441939a7a7d72abf8636f639f1fd0c1e84269
|
||||
SHA512 (samba-4.4.9.tar.xz) = f88eef036bcf744df2d3780e1ac50ac07e6290fa18b6947e92d130581b3b580a9c1cf4258a309c1dd98702e61e50ffbb48a4fd188e14a5ebe6bb7a8b2279df79
|
||||
|
|
|
|||
Loading…
Reference in New Issue