From 13e90a3b4a38e873970e764153359c606a140d7e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 24 Jun 2015 14:00:05 +0200 Subject: [PATCH] Fix tar support in smbclient --- samba.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/samba.spec b/samba.spec index 9b1be87..2922767 100644 --- a/samba.spec +++ b/samba.spec @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 0 +%define main_release 1 %define samba_version 4.2.2 %define talloc_version 2.1.2 @@ -23,6 +23,10 @@ %define samba_release %{main_release}%{?dist} %endif +# This is a network daemon, do a hardened build +# Enables PIE and full RELRO protection +%global _hardened_build 1 + %global with_libsmbclient 1 %global with_libwbclient 1 @@ -36,6 +40,9 @@ %global with_profiling 1 %global with_vfs_cephfs 1 +%if 0%{?rhel} +%global with_vfs_cephfs 0 +%endif %global with_vfs_glusterfs 1 %if 0%{?rhel} @@ -71,7 +78,7 @@ Name: samba Version: %{samba_version} -Release: %{samba_release}.2 +Release: %{samba_release} %if 0%{?rhel} Epoch: 0 @@ -141,6 +148,7 @@ BuildRequires: gawk BuildRequires: krb5-devel >= 1.10 BuildRequires: libacl-devel BuildRequires: libaio-devel +BuildRequires: libarchive-devel BuildRequires: libattr-devel BuildRequires: libcap-devel BuildRequires: libuuid-devel @@ -1060,6 +1068,14 @@ rm -rf %{buildroot} %{_mandir}/man8/vfs_worm.8* %{_mandir}/man8/vfs_xattr_tdb.8* +%if ! %{with_vfs_glusterfs} +%exclude %{_mandir}/man8/vfs_glusterfs.8* +%endif + +%if ! %{with_vfs_cephfs} +%exclude %{_mandir}/man8/vfs_ceph.8* +%endif + ### CLIENT %files client %defattr(-,root,root) @@ -1935,6 +1951,10 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Fri Jun 19 2015 Andreas Schneider - 4.2.2-1 +- resolves: #1227911 - Enable tar support for smbclient +- Enable hardened build + * Fri Jun 19 2015 Fedora Release Engineering - 2:4.2.2-0.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild