From ed4498495ec38ec1c63542f54cfe5333bde4e382 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Feb 06 2019 23:25:04 +0000
Subject: Fix index generation with xfsrestore


Recent changes to the permissions of /var/log/amanda caused issues with
index generation, because xfsrestore would put temporaries there.  So
instead force xfsrestore to (during index generation) store its
temporaries in /var/lib/amanda instead.

---

diff --git a/amanda.spec b/amanda.spec
index 9028b23..3875623 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary:       A network-capable tape backup solution
 Name:          amanda
 Version:       3.5.1
-Release:       15%{?dist}
+Release:       16%{?dist}
 Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1:       amanda.crontab
 Source4:       disklist
@@ -31,6 +31,10 @@ Patch4:        amanda-3.4.5-no-xinetd.patch
 # Support tirpc
 Patch5:        patch-tirpc
 
+# Specify the location or the xfs housekeeping directory
+# https://bugzilla.redhat.com/show_bug.cgi?id=1671117
+Patch6:        patch-xfsrestore-housekeeping
+
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 URL:           http://www.amanda.org
 BuildRequires: automake autoconf libtool
@@ -433,6 +437,10 @@ make check
 
 
 %changelog
+* Fri Feb 01 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.5.1-16
+- Add patch to specify xfsrestore housekeeping dir during index generation
+  (#1671117)
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/patch-xfsrestore-housekeeping b/patch-xfsrestore-housekeeping
new file mode 100644
index 0000000..a9907ae
--- /dev/null
+++ b/patch-xfsrestore-housekeeping
@@ -0,0 +1,13 @@
+diff --git a/client-src/sendbackup-dump.c b/client-src/sendbackup-dump.c
+index 1ff1223..ce0c47d 100644
+--- a/client-src/sendbackup-dump.c
++++ b/client-src/sendbackup-dump.c
+@@ -292,7 +292,7 @@ start_backup(
+ 	program->backup_name  = XFSDUMP;
+ 	program->restore_name = XFSRESTORE;
+ 
+-	indexcmd = g_strjoin(NULL, XFSRESTORE, " -t", " -v", " silent", " -",
++	indexcmd = g_strjoin(NULL, XFSRESTORE, " -a /var/lib/amanda -t", " -v", " silent", " -",
+ 	    " 2>/dev/null", " | sed", " -e", " \'s/^/\\//\'", NULL);
+ 
+ 	info_tapeheader(dle);