diff --git a/.gitignore b/.gitignore index dcda106..c81ae99 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,5 @@ samba-3.6.0pre1.tar.gz /samba-4.6.11.tar.asc /samba-4.6.12.tar.xz /samba-4.6.12.tar.asc +/samba-4.6.13.tar.xz +/samba-4.6.13.tar.asc diff --git a/samba-4.8.0-ceph.patch b/samba-4.8.0-ceph.patch new file mode 100644 index 0000000..d479d2b --- /dev/null +++ b/samba-4.8.0-ceph.patch @@ -0,0 +1,28 @@ +From ebae8df5e4b955f235cdeb629e99d32d35766d65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 15 Jan 2018 23:20:39 +0100 +Subject: [PATCH] FIXME: build: fix libceph-common detection + +Guenther + +Signed-off-by: Guenther Deschner +--- + source3/wscript | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/source3/wscript b/source3/wscript +index 0f8fe5452da..4eba0103be8 100644 +--- a/source3/wscript ++++ b/source3/wscript +@@ -1540,6 +1540,8 @@ main() { + conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include' + conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib' + conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir + '/lib/ceph' ++ else: ++ conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph' + + if (Options.options.with_cephfs and + conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and +-- +2.14.3 + diff --git a/samba.spec b/samba.spec index f3de767..570d86e 100644 --- a/samba.spec +++ b/samba.spec @@ -8,7 +8,7 @@ %define main_release 0 -%define samba_version 4.6.12 +%define samba_version 4.6.13 %define talloc_version 2.1.9 %define tdb_version 1.3.12 %define tevent_version 0.9.34 @@ -114,6 +114,8 @@ Source14: samba.pamd Source200: README.dc Source201: README.downgrade +Patch0: samba-4.8.0-ceph.patch + Requires(pre): /usr/sbin/groupadd Requires(post): systemd Requires(preun): systemd @@ -2661,6 +2663,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Wed Feb 14 2018 Guenther Deschner - 4.6.13-0 +- Update to Samba 4.6.13 + * Thu Dec 21 2017 Guenther Deschner - 4.6.12-0 - Update to Samba 4.6.12 diff --git a/sources b/sources index 6c7c6bf..e70f2d2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.6.12.tar.xz) = 6bd899fa20981521487dcd4794747bb5f923654959a57efcd8842cf6395bc3e86c81c6ef114d8172d535ce2461aec14855df17cc8e44e2641a071415615712dc -SHA512 (samba-4.6.12.tar.asc) = 5f06018f87056df617c2c32259a72347782130214bdb27a8d0f12dc2693794132e1a0b3aac3200c2852d50f589bbeef1d7951a7626e93c8e771f0082c98e6fb5 +SHA512 (samba-4.6.13.tar.xz) = 9347f41969313544e73070b7c7a9518383004bc62400101b049a94f7afa0e6627f249456c99663c4d7aad268bc0767f68233a63b8be99e49e5894829f9992f88 +SHA512 (samba-4.6.13.tar.asc) = b99ff728714f0752fcf044a0eab916af12794f1127fcf10f30806be76a96e2375aa3d650ab69bf071c6655b81bbc72a4be5cda9e7b4c40f81e6ad51f7eeefcdf