From 80f21d974cde2ac37f92fd0a6e40a7f55332beb1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mar 02 2017 08:29:32 +0000
Subject: Ignore parameter of discarded old configuration directive


---

diff --git a/xrootd-old-config.patch b/xrootd-old-config.patch
index a32ab0f..c16a310 100644
--- a/xrootd-old-config.patch
+++ b/xrootd-old-config.patch
@@ -1,5 +1,5 @@
 diff --git a/src/XrdFileCache/XrdFileCacheConfiguration.cc b/src/XrdFileCache/XrdFileCacheConfiguration.cc
-index 54712ef..599b42d 100644
+index 54712ef..965df28 100644
 --- a/src/XrdFileCache/XrdFileCacheConfiguration.cc
 +++ b/src/XrdFileCache/XrdFileCacheConfiguration.cc
 @@ -220,8 +220,10 @@ bool Cache::Config(XrdSysLogger *logger, const char *config_filename, const char
@@ -30,18 +30,19 @@ index 54712ef..599b42d 100644
        const char* params =  config.GetWord();
        if (params)
        {
-@@ -343,6 +350,10 @@ bool Cache::ConfigParameters(std::string part, XrdOucStream& config, TmpConfigur
+@@ -343,6 +350,11 @@ bool Cache::ConfigParameters(std::string part, XrdOucStream& config, TmpConfigur
           return false;
        }
     }
 +   else if ( part == "nramread" )
 +   {
 +      m_log.Emsg("Config", "pfc.nramread is deprecated, please use pfc.ram instead. Ignoring this directive.");
++      config.GetWord(); // Ignoring argument.
 +   }
     else if ( part == "ram" )
     {
        long long minRAM = 1024 * 1024 * 1024;
-@@ -365,8 +376,12 @@ bool Cache::ConfigParameters(std::string part, XrdOucStream& config, TmpConfigur
+@@ -365,8 +377,12 @@ bool Cache::ConfigParameters(std::string part, XrdOucStream& config, TmpConfigur
           return false;
        }
     }
diff --git a/xrootd.spec b/xrootd.spec
index 97d86c8..573ff25 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -16,7 +16,7 @@
 Name:		xrootd
 Epoch:		1
 Version:	4.6.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Extended ROOT file server
 
 Group:		System Environment/Daemons
@@ -58,6 +58,7 @@ Patch7:		%{name}-backward-compat.patch
 #		Accept old configuration directives for file cache
 #		https://github.com/xrootd/xrootd/issues/470
 #		https://github.com/xrootd/xrootd/pull/472
+#		https://github.com/xrootd/xrootd/pull/473
 Patch8:		%{name}-old-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -671,6 +672,9 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Thu Mar 02 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:4.6.0-6
+- Ignore parameter of discarded old configuration directive
+
 * Wed Mar 01 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:4.6.0-5
 - Fix backward compatibilities in XrdSecXtractor interface
 - Allow old configuration directives for file cache