From 837c9f1b1c14339ab538b00cb4e5af3b43eb8d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 3 Apr 2019 11:08:29 +0200 Subject: [PATCH] Update to Samba 4.10.1 Guenther --- .gitignore | 2 ++ samba-4.10-fix_make_install.patch | 39 ------------------------------- samba.spec | 9 +++---- sources | 4 ++-- 4 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 samba-4.10-fix_make_install.patch diff --git a/.gitignore b/.gitignore index df2a3cf..3c3ce17 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,5 @@ samba-3.6.0pre1.tar.gz /samba-4.10.0rc4.tar.asc /samba-4.10.0.tar.xz /samba-4.10.0.tar.asc +/samba-4.10.1.tar.xz +/samba-4.10.1.tar.asc diff --git a/samba-4.10-fix_make_install.patch b/samba-4.10-fix_make_install.patch deleted file mode 100644 index cafd0c1..0000000 --- a/samba-4.10-fix_make_install.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 739ac46f26e72a601405a0a59747b27584238b3e Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 20 Mar 2019 11:09:21 +0100 -Subject: [PATCH] s4:librpc: Fix installation of Samba - -This breaks installation of Samba 4.10 on Fedora. - -https://bugzilla.samba.org/show_bug.cgi?id=13847 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy - -(cherry picked from commit bf469343f577e2d78df0e38d80e7976b351eaf0d) ---- - source4/librpc/wscript_build | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build -index f00571e4bc3..d9b7743c9d1 100644 ---- a/source4/librpc/wscript_build -+++ b/source4/librpc/wscript_build -@@ -412,14 +412,6 @@ for env in bld.gen_python_environments(): - cflags_end=gen_cflags - ) - -- bld.SAMBA_PYTHON('python_idmap', -- source='../../librpc/gen_ndr/py_idmap.c', -- deps='NDR_IDMAP %s %s' % (pytalloc_util, pyrpc_util), -- realname='samba/dcerpc/idmap.so', -- cflags_end=gen_cflags -- ) -- -- - bld.SAMBA_PYTHON('python_drsuapi', - source='../../librpc/gen_ndr/py_drsuapi.c', - deps='RPC_NDR_DRSUAPI %s %s' % (pytalloc_util, pyrpc_util), --- -2.21.0 - diff --git a/samba.spec b/samba.spec index d829a3a..f2598f2 100644 --- a/samba.spec +++ b/samba.spec @@ -6,9 +6,9 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 6 +%define main_release 0 -%define samba_version 4.10.0 +%define samba_version 4.10.1 %define talloc_version 2.1.16 %define tdb_version 1.3.18 %define tevent_version 0.9.39 @@ -118,8 +118,6 @@ Source14: samba.pamd Source201: README.downgrade -Patch0: samba-4.10-fix_make_install.patch - Requires(pre): /usr/sbin/groupadd Requires(post): systemd Requires(preun): systemd @@ -3406,6 +3404,9 @@ fi %endif # with_clustering_support %changelog +* Wed Apr 03 2019 Guenther Deschner - 4.10.1-0 +- Update to Samba 4.10.1 + * Mon Mar 25 2019 Andreas Schneider - 4.10.0-6 - resolves: #1692347 - Add missing DC requirement for its python3 tools diff --git a/sources b/sources index 1c8fef9..2afb242 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.10.0.tar.xz) = 000b273fd071ce1d7853a9b09e690d28783d66e5519efbc2235705cee962d35e67d677dea2e8b0dda5d5c20253e309228498bbc72d1e37dc3e4ca074214c7815 -SHA512 (samba-4.10.0.tar.asc) = 6d1194afa71539f1e2dd7bb11c3c7f87933a57c17a2df26ae9604dfcd1b1a5f51912efc5d3a48c94ca6fe996baff8b65f15ce78ae42ef2c7b36cc7e34ce5cae2 +SHA512 (samba-4.10.1.tar.xz) = cee84e7c749b7beeb3b8e3804112873098b740d83d1bd11c040c1d817c94ce26745b5e78b209d7db5b8e346ed9ca6103c50c9dd86347bc92ee31d6224c2073ec +SHA512 (samba-4.10.1.tar.asc) = 0570cf5852d016f220dad523fab59f80a2a420872d7c97f40f75d7630877ed4daf2bf1e6540667d1f0592f0100b07622c74a1a74163b2d79ee1e4735d2c086d4