From 491397e9820f62b72309991727e4f111b1bd4666 Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Apr 08 2009 13:12:36 +0000
Subject: tcpport patch lost after rebase, adding again


---

diff --git a/amanda-2.6.0p2-tcpport.patch b/amanda-2.6.0p2-tcpport.patch
new file mode 100644
index 0000000..3ade508
--- /dev/null
+++ b/amanda-2.6.0p2-tcpport.patch
@@ -0,0 +1,21 @@
+diff -up amanda-2.6.0p2/example/amanda-client.conf.in.tcpp amanda-2.6.0p2/example/amanda-client.conf.in
+--- amanda-2.6.0p2/example/amanda-client.conf.in.tcpp	2009-04-06 16:46:35.000000000 +0200
++++ amanda-2.6.0p2/example/amanda-client.conf.in	2009-04-06 16:46:51.000000000 +0200
+@@ -22,3 +22,5 @@ auth "bsdtcp"
+ 
+ ssh_keys ""			# your ssh keys file if you use ssh auth
+ 
++#resolves "resource temporarily unavailable" bug
++unreserved-tcp-port 1025,65535
+\ No newline at end of file
+diff -up amanda-2.6.0p2/example/amanda.conf.in.tcpp amanda-2.6.0p2/example/amanda.conf.in
+--- amanda-2.6.0p2/example/amanda.conf.in.tcpp	2009-04-06 16:46:19.000000000 +0200
++++ amanda-2.6.0p2/example/amanda.conf.in	2009-04-06 16:47:10.000000000 +0200
+@@ -730,3 +730,6 @@ define interface local {
+ # configurations.
+ 
+ #includefile "@CONFIG_DIR@/amanda.conf.main"
++
++#resolves "resource temporarily unavailable" bug
++unreserved-tcp-port 1025,65535
+\ No newline at end of file
diff --git a/amanda.spec b/amanda.spec
index 24ec629..4070f7e 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -17,6 +17,7 @@ Source8: amandahosts
 Source9: README-rpm
 Patch1: amanda-2.6.0b3-example.patch
 Patch2: amanda-2.6.0b2-xattrs.patch
+Patch3: amanda-2.6.0p2-tcpport.patch
 Patch4: amanda-2.6.0b3-lib.patch
 Patch5: amanda-2.6.0p2-pie.patch
 License: BSD
@@ -87,6 +88,7 @@ be used to develop amanda applications.
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .example
 %patch2 -p1 -b .xattrs
+%patch3 -p1 -b .tcpport
 %patch4 -p1 -b .lib
 %patch5 -p1 -b .pie
 ./autogen
@@ -373,6 +375,10 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
 %{_libdir}/libamandad.so
 
 %changelog
+* Wed Apr 08 2009 Daniel Novotny <dnovotny@redhat.com> 2.6.0p2-7
+- the tcpport patch was lost after rebase, adding again
+  (#448071, #462681)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0p2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild