From 5cbc42b352c3bf19c65b1071126b5f519cdfec6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Fri, 13 Apr 2018 12:49:31 +0200 Subject: [PATCH] Update to Samba 4.6.15 Guenther --- .gitignore | 2 ++ samba-4.8.0-ceph.patch | 35 ----------------------------------- samba.spec | 7 ++++--- sources | 4 ++-- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 samba-4.8.0-ceph.patch diff --git a/.gitignore b/.gitignore index 7983419..25c4559 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,5 @@ samba-3.6.0pre1.tar.gz /samba-4.6.13.tar.asc /samba-4.6.14.tar.xz /samba-4.6.14.tar.asc +/samba-4.6.15.tar.xz +/samba-4.6.15.tar.asc diff --git a/samba-4.8.0-ceph.patch b/samba-4.8.0-ceph.patch deleted file mode 100644 index 515444a..0000000 --- a/samba-4.8.0-ceph.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 73f077204f70a157c3e1b3c63996ac29b005ea5b 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 | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/source3/wscript b/source3/wscript -index 6d2d94bae87..48a9271f002 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1547,11 +1547,13 @@ 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 -- conf.CHECK_LIB('cephfs', shlib=True) and -- conf.CHECK_LIB('ceph-common', shlib=True)): -+ conf.CHECK_LIB('cephfs', shlib=True)): -+ conf.CHECK_LIB('ceph-common', shlib=True) - if Options.options.with_acl_support: - conf.DEFINE('HAVE_CEPH', '1') - if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common', --- -2.14.3 - diff --git a/samba.spec b/samba.spec index b6b2890..5c35c0a 100644 --- a/samba.spec +++ b/samba.spec @@ -8,7 +8,7 @@ %define main_release 0 -%define samba_version 4.6.14 +%define samba_version 4.6.15 %define talloc_version 2.1.9 %define tdb_version 1.3.12 %define tevent_version 0.9.34 @@ -114,8 +114,6 @@ 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 @@ -2663,6 +2661,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Fri Apr 13 2018 Guenther Deschner - 4.6.15-0 +- Update to Samba 4.6.15 + * Tue Mar 13 2018 Guenther Deschner - 4.6.14-0 - Update to Samba 4.6.14 - resolves: #1554754, #1554756 - Security fixes for CVE-2018-1050 CVE-2018-1057 diff --git a/sources b/sources index 3b4a245..79fe149 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.6.14.tar.xz) = 4d2cb09b1d01cac3d96be16540b8cc064671d5310198abfe5780c2016c762cc18fe0461fdeab1402a101014cbee59c553bf9d2b1b00fac95cd6d6a1093735e7d -SHA512 (samba-4.6.14.tar.asc) = c4dc2a00e0d8b428f40542efebbf9fa2251c0ac71222a5695c8567f05deeb851904fdce35ffa798eae0641e2baced392f3ce8a725d3e6553bdb6759c11ab5286 +SHA512 (samba-4.6.15.tar.xz) = 6cfcaf92fd217f9eb84f1cebefc28035721b8dcd3af2ac432bb90e1a51a95cd6c61078364dff0dd2045397d35e13d342b293014e451ac277da9a5d646da6c0ed +SHA512 (samba-4.6.15.tar.asc) = 1b1cae6c7e3f89e5035da3f23587308e134e70e8a190dd5080ba193ffcc6942a23bbece62648d1d53d44bd38390c1ca31f134fa9b9b951d7d33b3452bdcad19c