From e628bd9e14ab81d85447ffbed6a397b3709297fc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:11:56 +0000
Subject: import amanda-3.3.3-17.el7


---

diff --git a/SOURCES/amanda-error-amrecover.patch b/SOURCES/amanda-error-amrecover.patch
new file mode 100644
index 0000000..1e9d977
--- /dev/null
+++ b/SOURCES/amanda-error-amrecover.patch
@@ -0,0 +1,36 @@
+diff --git a/server-src/amidxtaped.pl b/server-src/amidxtaped.pl
+index 79ea978..5a4106e 100644
+--- a/server-src/amidxtaped.pl
++++ b/server-src/amidxtaped.pl
+@@ -890,7 +890,8 @@ sub getline {
+ 	last if $c eq "\n";
+     }
+ 
+-    my $chopped = $line;
++    $line =~ /^(.*)$/;
++    my $chopped = $1;
+     $chopped =~ s/[\r\n]*$//g;
+     debug("CTL << $chopped");
+ 
+@@ -914,8 +915,8 @@ sub getline_async {
+ 	return $async_read_cb->($err, undef) if $err;
+ 
+ 	$buf .= $data;
+-	if ($buf =~ /\r\n$/) {
+-	    my $chopped = $buf;
++	if ($buf =~ /^(.*\r\n)$/) {
++	    my $chopped = $1;
+ 	    $chopped =~ s/[\r\n]*$//g;
+ 	    debug("CTL << $chopped");
+ 
+@@ -951,8 +952,8 @@ sub sendctlline {
+     my $self = shift;
+     my ($msg, $async_write_cb) = @_;
+ 
+-    my $chopped = $msg;
+-    $chopped =~ s/[\r\n]*$//g;
++    $msg =~ /^(.*)$/;
++    my $chopped = $1;
+ 
+     if ($self->{'ctl_stream'}) {
+ 	debug("CTL >> $chopped");
diff --git a/SPECS/amanda.spec b/SPECS/amanda.spec
index 8c41e20..388ee54 100644
--- a/SPECS/amanda.spec
+++ b/SPECS/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.3
-Release: 13%{?dist}
+Release: 17%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -27,15 +27,14 @@ Patch6: amanda-3.2.0-config-dir.patch
 Patch10: amanda-3.3.1-stdio.patch
 Patch11: amanda-3.3.2-autogen.patch
 Patch12: amanda-common-makefile.patch
+Patch13: amanda-error-amrecover.patch
 
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
 URL: http://www.amanda.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake autoconf libtool
-%if 0%{?fedora}
-BuildRequires: dump
-%endif
+BuildRequires: dump, xfsdump
 BuildRequires: gnuplot cups samba-client tar grep fileutils
 BuildRequires: gcc-c++ readline-devel
 BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st
@@ -108,10 +107,11 @@ server also needs to have the amanda-client package installed.
 %patch10 -p1 -b .stdio
 %patch11 -p1 -b .autogen
 %patch12 -p1 -b .common-makefile
+%patch13 -p1 -b .error-amrecover
 ./autogen
 
 %build
-export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -fstack-protector-strong" LDFLAGS=-pie
+export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -fstack-protector-strong -z relro -z now" LDFLAGS=-pie
 
 %configure --enable-shared \
            --disable-rpath \
@@ -473,6 +473,20 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Aug 23 2016 Petr Hracek <phracek@redhat.com> - 3.3.3-17
+- Related: #1140321 Missing build dep on xfsdump
+
+* Tue Mar 15 2016 Petr Hracek <phracek@redhat.com> - 3.3.3-16
+- Fix bug error on amrecover tool for amanda backup server
+- Resolves: #1157463
+
+* Tue Mar 15 2016 Petr Hracek <phracek@redhat.com> - 3.3.3-15
+- Fixes PIE and RELRO check
+- Resolves: #1092359
+
+* Thu Feb 18 2016 Petr Hracek <phracek@redhat.com> - 3.3.3-14
+- Resolves: #1140321 Missing build dep on dump
+
 * Tue Mar 18 2014 Petr Hracek <phracek@redhat.com> - 3.3.3-13
 - Resolves: #881128 multilib conflicts