diff --git a/.gitignore b/.gitignore index bd21975..4e680c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ SOURCES/samba-4.11.11.tar.xz SOURCES/samba-4.11.11.tar.asc +SOURCES/samba-4.11.12.tar.xz +SOURCES/samba-4.11.12.tar.asc diff --git a/SOURCES/do-not-install-test-util-binary.patch b/SOURCES/do-not-install-test-util-binary.patch new file mode 100644 index 0000000..7df6eee --- /dev/null +++ b/SOURCES/do-not-install-test-util-binary.patch @@ -0,0 +1,24 @@ +From 161086398b2f3e3fa52d5a3940b0aef907dc0a13 Mon Sep 17 00:00:00 2001 +From: Anoop C S +Date: Tue, 25 Aug 2020 16:12:45 +0530 +Subject: [PATCH] lib/util: Do not install test_util + +Signed-off-by: Anoop C S +--- + lib/util/wscript_build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/util/wscript_build b/lib/util/wscript_build +index 4ac0a9cc064..e04752cb130 100644 +--- a/lib/util/wscript_build ++++ b/lib/util/wscript_build +@@ -291,4 +291,5 @@ else: + bld.SAMBA_BINARY('test_util', + source='tests/test_util.c', + deps='cmocka replace talloc samba-util', +- local_include=False) ++ local_include=False, ++ install=False) +-- +2.26.2 + diff --git a/SOURCES/do-not-install-test_util_paths_binary.patch b/SOURCES/do-not-install-test_util_paths_binary.patch deleted file mode 100644 index e31d828..0000000 --- a/SOURCES/do-not-install-test_util_paths_binary.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4fe5013e209939f13816be2b38c6101afe3fe53a Mon Sep 17 00:00:00 2001 -From: Anoop C S -Date: Thu, 9 Jul 2020 15:57:55 +0530 -Subject: [PATCH] lib/util: Do not install test_util_paths binary by default - -Signed-off-by: Anoop C S ---- - lib/util/wscript_build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/util/wscript_build b/lib/util/wscript_build -index 9cf411007eb..84c19bb136f 100644 ---- a/lib/util/wscript_build -+++ b/lib/util/wscript_build -@@ -285,4 +285,5 @@ else: - bld.SAMBA_BINARY('test_util_paths', - source='tests/test_util_paths.c', - deps='cmocka replace talloc samba-util', -- local_include=False) -+ local_include=False, -+ install=False) --- -2.26.2 - diff --git a/SPECS/samba.spec b/SPECS/samba.spec index c94363c..2c864b4 100644 --- a/SPECS/samba.spec +++ b/SPECS/samba.spec @@ -6,13 +6,9 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 2 +%define main_release 1 -%define samba_version 4.11.11 -%define talloc_version 2.2.0 -%define tdb_version 1.4.2 -%define tevent_version 0.10.0 -%define ldb_version 2.0.8 +%define samba_version 4.11.12 # This should be rc1 or nil %define pre_release %nil @@ -118,7 +114,7 @@ Source15: samba.pamd Source100: ctdb.conf Source101: script.options -Patch1: do-not-install-test_util_paths_binary.patch +Patch1: do-not-install-test-util-binary.patch Patch2: remove-talloc-ldb-requires-from-samba-policy.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -261,7 +257,7 @@ BuildRequires: python3-tevent >= %{libtevent_version} %endif %if ! %with_internal_ldb -%global libldb_version 2.0.8 +%global libldb_version 2.0.11 BuildRequires: libldb-devel >= %{libldb_version} BuildRequires: python3-ldb-devel >= %{libldb_version} @@ -2746,6 +2742,9 @@ rm -rf %{buildroot} %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user.*.pyc %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_check_password_script.*.pyc %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA.*.pyc +%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA_base.*.pyc +%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA_gpg.*.pyc +%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA_userPassword.*.pyc %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_wdigest.*.pyc %{python3_sitearch}/samba/tests/samba_tool/__pycache__/visualize.*.pyc %{python3_sitearch}/samba/tests/samba_tool/__pycache__/visualize_drs.*.pyc @@ -2777,6 +2776,9 @@ rm -rf %{buildroot} %{python3_sitearch}/samba/tests/samba_tool/user.py %{python3_sitearch}/samba/tests/samba_tool/user_check_password_script.py %{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA.py +%{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA_base.py +%{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py +%{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py %{python3_sitearch}/samba/tests/samba_tool/user_wdigest.py %{python3_sitearch}/samba/tests/samba_tool/visualize.py %{python3_sitearch}/samba/tests/samba_tool/visualize_drs.py @@ -3755,6 +3757,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Aug 25 2020 - Anoop C S - 4.11.12-1 +- v4.11.12 GA + * Fri Jul 17 2020 - Anoop C S - 4.11.11-2 - Do not ship talloc and ldb man pages with samba-client-libs