diff --git a/.gitignore b/.gitignore index 9e1908b..7da192c 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ samba-3.6.0pre1.tar.gz /samba-4.2.2.tar.xz /samba-4.2.3.tar.xz /samba-4.2.5.tar.xz +/samba-4.2.6.tar.xz diff --git a/samba-4.3.3-async_connect_send_test.patch b/samba-4.3.3-async_connect_send_test.patch new file mode 100644 index 0000000..efe9c8f --- /dev/null +++ b/samba-4.3.3-async_connect_send_test.patch @@ -0,0 +1,31 @@ +From 632114584d3be0d4660e97a6c9e69e577a7bc1e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +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 +Reviewed-by: Ralph Boehme +--- + 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 f8495f3..4e83c8b 100644 --- a/samba.spec +++ b/samba.spec @@ -8,7 +8,7 @@ %define main_release 0 -%define samba_version 4.2.5 +%define samba_version 4.2.6 %define talloc_version 2.1.2 %define ntdb_version 1.0 %define tdb_version 1.3.6 @@ -109,6 +109,8 @@ 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 @@ -644,6 +646,8 @@ 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 @@ -1941,6 +1945,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Wed Dec 09 2015 Guenther Deschner - 4.2.6-0 +- Update to Samba 4.2.6 + * Mon Nov 09 2015 Guenther Deschner - 4.2.5-0 - Update to Samba 4.2.5 diff --git a/sources b/sources index cf77d3c..09c761a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c328cec16352b461f140a865c26b6c38 samba-4.2.5.tar.xz +13d8577200e9bfc94788564fb7255695 samba-4.2.6.tar.xz