[fedfs-utils] - update to fedfs-utils 0.9.3 - enable hardened build - various .spec clean-ups

Chuck Lever mrchuck at fedoraproject.org
Wed Sep 4 18:57:56 UTC 2013


commit 295c4ff232fb61601961d90ea26bd7e23a061c6a
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Sep 4 14:57:16 2013 -0400

    - update to fedfs-utils 0.9.3
    - enable hardened build
    - various .spec clean-ups

 .gitignore       |    1 +
 fedfs-utils.spec |   78 ++++++++++++++++++++++++++++++++---------------------
 sources          |    2 +-
 3 files changed, 49 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 67744e6..33484bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /fedfs-utils-0.9.0.tar.gz
 /fedfs-utils-0.9.1.tar.gz
 /fedfs-utils-0.9.2.tar.gz
+/fedfs-utils-0.9.3.tar.gz
diff --git a/fedfs-utils.spec b/fedfs-utils.spec
index 7507937..fe4d208 100644
--- a/fedfs-utils.spec
+++ b/fedfs-utils.spec
@@ -1,6 +1,6 @@
 Name:           fedfs-utils
-Version:        0.9.2
-Release:        3%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Utilities for mounting and managing FedFS
 
 Group:          System Environment/Daemons
@@ -12,23 +12,24 @@ BuildRequires:  openssl-devel libxml2-devel uriparser-devel
 
 Source0:        http://oss.oracle.com/projects/%{name}/dist/files/%{name}-%{version}.tar.gz
 
+%global _hardened_build 1
 %global unit_name rpcfedfsd
 %define debug_package %{nil}
 
 %description
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -51,13 +52,16 @@ mkdir -p %{buildroot}/nfs4
 install -m 644 contrib/init/%{unit_name}.service %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 contrib/init/fedfs %{buildroot}%{_sysconfdir}/sysconfig
-mkdir -p %{buildroot}/etc/auto.master.d
-install -m 644 contrib/init/fedfs.autofs %{buildroot}/etc/auto.master.d
+mkdir -p %{buildroot}/%{_sysconfdir}/auto.master.d
+install -m 644 contrib/init/fedfs.autofs %{buildroot}/%{_sysconfdir}/auto.master.d
 
 # Don't package static libs to encourage use of shared library.
 rm -f %{buildroot}%{_libdir}/libnfsjunct.a
 rm -f %{buildroot}%{_libdir}/libnfsjunct.la
 
+%clean
+rm -rf %{buildroot}
+
 %package common
 Summary:      Common files for FedFS
 Group:        System Environment/Daemons
@@ -67,17 +71,17 @@ This package contains files common to all of the fedfs packages.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -86,6 +90,7 @@ referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files common
+%defattr(-,root,root,-)
 %doc COPYING README INSTALL ChangeLog doc/ldap/fedfs.schema doc/ldap/fedfs-schema.ldif
 %{_mandir}/man7/fedfs.7.*
 
@@ -102,17 +107,17 @@ as a client.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -121,12 +126,13 @@ referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files client
+%defattr(-,root,root,-)
 /sbin/mount.fedfs
 %{_sbindir}/fedfs-map-nfs4
 %{_mandir}/man8/mount.fedfs.8.*
 %{_mandir}/man8/fedfs-map-nfs4.8.*
 %dir /nfs4
-%config(noreplace) /etc/auto.master.d/fedfs.autofs
+%config(noreplace) /%{_sysconfdir}/auto.master.d/fedfs.autofs
 
 %post client
 # We may have changed the automounter configuration
@@ -147,17 +153,17 @@ and domain administration.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -166,6 +172,7 @@ referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files nsdbparams
+%defattr(-,root,root,-)
 %{_sbindir}/nsdbparams
 %{_mandir}/man8/nsdbparams.8.*
 %{_mandir}/man7/nsdb-parameters.7.*
@@ -181,17 +188,17 @@ NFS and FedFS junction support to be enabled in nfs-utils.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -200,6 +207,7 @@ referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/nfs-plugin.h
 
 %package lib
@@ -214,17 +222,17 @@ rpc.mountd.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -239,6 +247,7 @@ FedFS may support other network file system protocols in the future.
 %files lib
 # We need to include this in the lib package because it is
 # dlopen()ed by the junction support code in nfs-utils.
+%defattr(-,root,root,-)
 %{_libdir}/libnfsjunct.so
 %{_libdir}/libnfsjunct.so.*
 
@@ -248,7 +257,7 @@ Group:        System Environment/Daemons
 Requires:     %{name}-common = %{version}-%{release}
 Requires:     %{name}-nsdbparams%{?_isa} = %{version}-%{release}
 Requires:     %{name}-lib%{?_isa} = %{version}-%{release}
-Requires:     nfs-utils
+Requires:     nfs-utils-1.2.8
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
@@ -259,17 +268,17 @@ on a Linux NFS fileserver.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -294,6 +303,7 @@ exit 0
 %systemd_postun_with_restart %{unit_name}.service
 
 %files server
+%defattr(-,root,root,-)
 %dir %{_sharedstatedir}/fedfs
 %{_sbindir}/nfsref
 %{_sbindir}/rpc.fedfsd
@@ -312,17 +322,17 @@ This package contains the tools needed to manage a FedFS domain.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent namespace across multiple file servers using file
+construct a coherent file name space across multiple file servers using file
 system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
-automounted directory where a new file system mount is done when an
+auto-mounted directory where a new file system mount is done when an
 application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its namespace features by leveraging
+system protocols. FedFS provides its file name space features by leveraging
 referral mechanisms already built in to network file system protocols.
 Thus no change to file system protocols or clients is required.
 
@@ -331,6 +341,7 @@ referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files admin
+%defattr(-,root,root,-)
 %{_sbindir}/fedfs-create-junction
 %{_sbindir}/fedfs-create-replication
 %{_sbindir}/fedfs-delete-junction
@@ -355,6 +366,11 @@ FedFS may support other network file system protocols in the future.
 %{_mandir}/man8/nsdb-*
 
 %changelog
+* Wed Sep 04 2013 Chuck Lever <chuck.lever at oracle.com> - 0.9.3-1
+- update to fedfs-utils 0.9.3
+- enable hardened build
+- various .spec clean-ups
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -417,7 +433,7 @@ FedFS may support other network file system protocols in the future.
 * Mon Dec 5 2011 Ian Kent <ikent at redhat.com> 0.7.3-2
 - add systemd-units to BuildRequires as per systemd doco.
 
-* Fri Nov 30 2011 Jeff Layton <jlayton at redhat.com> 0.7.3-1
+* Wed Nov 30 2011 Jeff Layton <jlayton at redhat.com> 0.7.3-1
 - update to 0.7.3 release
 
 * Fri Nov 04 2011 Jeff Layton <jlayton at redhat.com> 0.7.2-1
diff --git a/sources b/sources
index 3c0d469..5490400 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9eabf1b98e564c50fc45a1e03e0a0da3  fedfs-utils-0.9.2.tar.gz
+d1ed17f482103ce629f2439ddc9ab251  fedfs-utils-0.9.3.tar.gz


More information about the scm-commits mailing list