From 6e50529ec517625000eee609e864c63afb33ba83 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 3 Mar 2015 14:20:23 +0100
Subject: [PATCH] Update to Samba 4.2.0rc5

---
 .gitignore |  1 +
 samba.spec | 10 +++++++---
 sources    |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 079b0e3..f3856f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.2.0rc2.tar.xz
 /samba-4.2.0rc3.tar.xz
 /samba-4.2.0rc4.tar.xz
+/samba-4.2.0rc5.tar.xz
diff --git a/samba.spec b/samba.spec
index 656aeed..6a3b9e2 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 5
+%define main_release 6
 
 %define samba_version 4.2.0
 %define talloc_version 2.1.1
@@ -15,7 +15,7 @@
 %define tevent_version 0.9.22
 %define ldb_version 1.1.17
 # This should be rc1 or nil
-%define pre_release rc4
+%define pre_release rc5
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -649,7 +649,6 @@ and use CTDB instead.
 
 %global _samba4_private_libraries %{_libsmbclient}%{_libwbclient}
 
-LDFLAGS="-Wl,-z,relro,-z,now" \
 %configure \
         --enable-fhs \
         --with-piddir=/run \
@@ -663,6 +662,8 @@ LDFLAGS="-Wl,-z,relro,-z,now" \
         --with-shared-modules=%{_samba4_modules} \
         --bundled-libraries=%{_samba4_libraries} \
         --with-pam \
+        --with-pie \
+        --with-relro \
         --without-fam \
 %if (! %with_libsmbclient) || (! %with_libwbclient)
         --private-libraries=%{_samba4_private_libraries} \
@@ -1854,6 +1855,9 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Tue Mar 03 2015 Andreas Schneider <asn@redhat.com> - 4.2.0-0.5.rc5
+- Update to Samba 4.2.0rc5
+
 * Fri Jan 16 2015 - Andreas Schneider <asn@redhat.com> - 4.2.0-0.4.rc4
 - Update to Samba 4.2.0rc4
 - resolves: #1154600 - Install missing samba pam.d configuration file.
diff --git a/sources b/sources
index d362312..ca07a2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a244a0e03cd104c764220878c1fbd04e  samba-4.2.0rc4.tar.xz
+d07f472d704a619b853a62e0f1b95142  samba-4.2.0rc5.tar.xz