summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2016-01-12 10:45:12 +0100
committerGünther Deschner <gd@samba.org>2016-01-12 10:45:12 +0100
commit0b57314e30721d3a0f0bf9bd6ed2e03ebfb29f3f (patch)
tree0933d8a6603c4e61cea8c64a6d4b8731c3578aea
parent37f4ca9e3ed5e064c47aa26d03e731181763247f (diff)
Update to Samba 4.3.4
resolves: #1261230 Guenther
-rw-r--r--.gitignore1
-rw-r--r--samba-4.3.3-async_connect_send_test.patch31
-rw-r--r--samba.spec9
-rw-r--r--sources2
4 files changed, 6 insertions, 37 deletions
diff --git a/.gitignore b/.gitignore
index 782c4d3..fd9d9d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ samba-3.6.0pre1.tar.gz
/samba-4.3.1.tar.xz
/samba-4.3.2.tar.xz
/samba-4.3.3.tar.xz
+/samba-4.3.4.tar.xz
diff --git a/samba-4.3.3-async_connect_send_test.patch b/samba-4.3.3-async_connect_send_test.patch
deleted file mode 100644
index efe9c8f..0000000
--- a/samba-4.3.3-async_connect_send_test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 632114584d3be0d4660e97a6c9e69e577a7bc1e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
-Date: Tue, 1 Dec 2015 14:39:37 +0100
-Subject: [PATCH] lib/async_req: do not install async_connect_send_test.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Guenther
-
-Signed-off-by: Günther Deschner <gd@samba.org>
-Reviewed-by: Ralph Boehme <slow@samba.org>
----
- lib/async_req/wscript_build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
-index 9c25223..bf79fdd 100644
---- a/lib/async_req/wscript_build
-+++ b/lib/async_req/wscript_build
-@@ -9,5 +9,6 @@ bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
-
- bld.SAMBA_BINARY('async_connect_send_test',
- source='async_connect_send_test.c',
-- deps='LIBASYNC_REQ'
-+ deps='LIBASYNC_REQ',
-+ install=False
- )
---
-2.5.0
-
diff --git a/samba.spec b/samba.spec
index e7e764e..9406a1a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,7 +8,7 @@
%define main_release 0
-%define samba_version 4.3.3
+%define samba_version 4.3.4
%define talloc_version 2.1.3
%define tdb_version 1.3.7
%define tevent_version 0.9.25
@@ -107,8 +107,6 @@ Source6: samba.pamd
Source200: README.dc
Source201: README.downgrade
-Patch0: samba-4.3.3-async_connect_send_test.patch
-
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): /usr/sbin/groupadd
@@ -673,8 +671,6 @@ and use CTDB instead.
%prep
%setup -q -n samba-%{version}%{pre_release}
-%patch0 -p1 -b .samba-4.3.3-async_connect_send_test.patch
-
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
%global _tevent_lib ,tevent,pytevent
@@ -1982,6 +1978,9 @@ rm -rf %{buildroot}
%endif # with_clustering_support
%changelog
+* Tue Jan 12 2016 Guenther Deschner <gdeschner@redhat.com> - 4.3.4-0
+- resolves: #1261230 - Update to Samba 4.3.4
+
* Wed Dec 16 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.3-0
- Update to Samba 4.3.3
- resolves: #1292069
diff --git a/sources b/sources
index 64ac45b..e20f6ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4d1ec06f6c48bed51e268947eb812b5 samba-4.3.3.tar.xz
+d0ba6f4da4a7fc4304084d42a2a1a8c7 samba-4.3.4.tar.xz