From 6bcf790db825201074d5037fd7ccd265ad6e8c8c Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Jan 13 2017 20:41:35 +0000
Subject: Add patch to avoid breakage with RHEL5 clients.


---

diff --git a/amanda-3.4.1-support-old-clients.patch b/amanda-3.4.1-support-old-clients.patch
new file mode 100644
index 0000000..9d95bf9
--- /dev/null
+++ b/amanda-3.4.1-support-old-clients.patch
@@ -0,0 +1,16 @@
+diff --git a/server-src/diskfile.c b/server-src/diskfile.c
+index ffee14e..929c05e 100644
+--- a/server-src/diskfile.c
++++ b/server-src/diskfile.c
+@@ -1178,6 +1178,11 @@ char *optionstr(disk_t *dp)
+     g_assert(dp != NULL);
+     g_assert(dp->host != NULL);
+ 
++    /* An empty element at the beginning ensures that the final options string
++     * begins with a semicolon.  This helps to prevent breakage when talking to
++     * very old clients. */
++    g_ptr_array_add(array, g_strdup(""));
++
+     their_features = dp->host->features;
+ 
+     if (am_has_feature(their_features, fe_options_auth))
diff --git a/amanda.spec b/amanda.spec
index 3458cc5..d3d45f4 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary:       A network-capable tape backup solution
 Name:          amanda
 Version:       3.4.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1:       amanda.crontab
 Source4:       disklist
@@ -28,6 +28,7 @@ Patch2:        amanda-3.1.1-tcpport.patch
 Patch3:        amanda-3.2.0-config-dir.patch
 #Bugfix - solved problem with permission error message (#1257686)
 Patch4:        amanda-3.3.9-hash-permission.patch
+Patch5:        amanda-3.4.1-support-old-clients.patch
 
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 Group:         Applications/System
@@ -106,11 +107,7 @@ the AMANDA server machine.  And, if the server is also to be backed up, the
 server also needs to have the amanda-client package installed.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .xattrs
-%patch2 -p1 -b .tcpport
-%patch3 -p1 -b .config
-%patch4 -p1 -b .hash-permission
+%autosetup -p1 -n %{name}-%{version}
 ./autogen
 
 %build
@@ -140,7 +137,7 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
            --with-bsdtcp-security \
            --with-bsdudp-security \
            --with-krb5-security
-        
+
 pushd perl
 make maintainer-clean-am
 popd
@@ -445,6 +442,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Jan 13 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.1-3
+- Add patch to avoid breakage with RHEL5 clients.
+
 * Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.4.1-2
 - Rebuild for readline 7.x