From 4bd0e999926a6745fb0d04b25b10b39d57ad706e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:32:06 +0000
Subject: import fedfs-utils-0.10.3-2.el7


---

diff --git a/.fedfs-utils.metadata b/.fedfs-utils.metadata
index 57ee90b..aae197a 100644
--- a/.fedfs-utils.metadata
+++ b/.fedfs-utils.metadata
@@ -1 +1 @@
-5de6de07b0087772b7dd747c3b3d86c4f866f96f SOURCES/fedfs-utils-0.10.0.tar.gz
+19a4598f55803ae969fe5c95e5da9cdeadf33c2f SOURCES/fedfs-utils-0.10.3.tar.gz
diff --git a/.gitignore b/.gitignore
index 82b8f0d..16177bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/fedfs-utils-0.10.0.tar.gz
+SOURCES/fedfs-utils-0.10.3.tar.gz
diff --git a/SOURCES/fedfs-utils-0.10.0-missing-man-pages.patch b/SOURCES/fedfs-utils-0.10.0-missing-man-pages.patch
deleted file mode 100644
index e3706a0..0000000
--- a/SOURCES/fedfs-utils-0.10.0-missing-man-pages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
-index 1d34632..974b911 100644
---- a/doc/man/Makefile.am
-+++ b/doc/man/Makefile.am
-@@ -41,7 +41,8 @@ MISC_CMDS		= rpc.fedfsd.8 nsdbparams.8 nfsref.8
- MOUNT_CMDS		= mount.fedfs.8 fedfs-map-nfs4.8
- 
- man_MANS		= $(MISC_DOCS) $(MISC_CMDS) $(PYTHON_CMDS) \
--			  $(ADMIN_CLIENT_CMDS) $(NSDB_CLIENT_CMDS)
-+			  $(ADMIN_CLIENT_CMDS) $(NSDB_CLIENT_CMDS) \
-+			  $(MOUNT_CMDS)
- 
- 
- CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
diff --git a/SPECS/fedfs-utils.spec b/SPECS/fedfs-utils.spec
index fb885bd..ed63cf4 100644
--- a/SPECS/fedfs-utils.spec
+++ b/SPECS/fedfs-utils.spec
@@ -1,6 +1,6 @@
 Name:           fedfs-utils
-Version:        0.10.0
-Release:        1%{?dist}
+Version:        0.10.3
+Release:        2%{?dist}
 Summary:        Utilities for mounting and managing FedFS
 
 Group:          System Environment/Daemons
@@ -15,8 +15,6 @@ BuildRequires:  systemd systemd-units
 
 Source0:        http://oss.oracle.com/projects/%{name}/dist/files/%{name}-%{version}.tar.gz
 
-Patch100:       fedfs-utils-0.10.0-missing-man-pages.patch
-
 %global _hardened_build 1
 %global unit_name rpcfedfsd
 # %define debug_package %{nil}
@@ -45,9 +43,17 @@ FedFS may support other network file system protocols in the future.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch100 -p1
 
 %build
+%ifarch s390 s390x
+PIE="-fPIE"
+%else
+PIE="-fpie"
+%endif
+export PIE
+export CFLAGS="$RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+
 ./autogen.sh
 %configure --prefix=/usr
 make %{?_smp_mflags}
@@ -418,6 +424,13 @@ FedFS may support other network file system protocols in the future.
 %{_mandir}/man8/nsdb-*
 
 %changelog
+* Wed Oct 22 2014 Steve Dickson <steved@redhat.com> - 0.10.3-2
+- Reworked CFLAGS to put back execshield (bz 983257)
+
+* Tue Oct 21 2014 Steve Dickson <steved@redhat.com> - 0.10.3-1
+- Updated to latest upstream release: 0.10.3 (bz 1110228)
+- Added the PIE and RELRO CFLAGS (bz 983257)
+
 * Sat Mar  8 2014 Steve Dickson <steved@redhat.com> - 0.10.0-1
 - Updated to latest upstream release: 0.10.0 (bz 1069971)