[amanda] - upgrade to new upstream release - uses bsdtcp authentication by default - dropped amanda-3.1.1-bsd

[Jan Görig]

commit 8f856a91cd251f308210c18c9c7d8f6a15929d37
Author: Jan Görig <jgorig at redhat.com>
Date:   Wed Jun 8 13:13:02 2011 +0200

    - upgrade to new upstream release
    - uses bsdtcp authentication by default
    - dropped amanda-3.1.1-bsd.patch

 .gitignore             |    1 +
 amanda-3.1.1-bsd.patch |   28 ----------------------------
 amanda-xinetd          |   10 ++++++----
 amanda.spec            |   15 ++++++++-------
 sources                |    2 +-
 5 files changed, 16 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83a7e5a..c32f3d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ amanda-3.1.1.tar.gz
 /amanda-3.2.1.tar.gz
 /amanda-3.2.2.tar.gz
 /amanda-3.3.0beta1.tar.gz
+/amanda-3.3.0.tar.gz
diff --git a/amanda-xinetd b/amanda-xinetd
index 0c6a256..ec084ae 100644
--- a/amanda-xinetd
+++ b/amanda-xinetd
@@ -5,11 +5,13 @@
 
 service amanda
 {
-	socket_type		= dgram
-	protocol		= udp
-	wait			= yes
+	flags			= IPv4
+	socket_type		= stream
+	protocol		= tcp
+	wait			= no
 	user			= amandabackup
 	group			= disk
+	groups			= yes
 	server			= /usr/sbin/amandad
 # Configure server_args for the authentication type you will be using,
 # and the services you wish to allow the amanda server and/or recovery
@@ -18,6 +20,6 @@ service amanda
 # Change the -auth= entry to reflect the authentication type you use.
 # Add amindexd to allow recovery clients to access the index database.
 # Add amidxtaped to allow recovery clients to access the tape device.
-	server_args		= -auth=bsd amdump
+	server_args		= -auth=bsdtcp amdump
 	disable			= yes
 }
diff --git a/amanda.spec b/amanda.spec
index 0a52516..09d52d9 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -8,9 +8,8 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.0
-Release: 0.1.beta1%{?dist}
-#Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
-Source: http://downloads.sourceforge.net/amanda/amanda-3.3.0beta1.tar.gz
+Release: 1%{?dist}
+Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
 Source5: amanda-xinetd
@@ -18,7 +17,6 @@ Source8: amandahosts
 Patch1: amanda-3.1.0-example.patch
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
-Patch5: amanda-3.1.1-bsd.patch
 Patch6: amanda-3.2.0-config-dir.patch
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
@@ -79,12 +77,10 @@ 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}
-%setup -q -n %{name}-3.3.0beta1
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .example
 %patch2 -p1 -b .xattrs
 %patch3 -p1 -b .tcpport
-%patch5 -p1 -b .bsd
 %patch6 -p1 -b .config
 ./autogen
 
@@ -434,6 +430,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Jun 08 2011 Jan Görig <jgorig at redhat.com> - 3.3.0-1
+- upgrade to new upstream release
+- uses bsdtcp authentication by default
+- dropped amanda-3.1.1-bsd.patch
+
 * Wed May 4 2011 Jan Görig <jgorig at redhat.com> - 3.3.0-0.1.beta1
 - update to new upstream beta release
 - removed merged patch amanda-3.2.2-krb5-libs.patch
diff --git a/sources b/sources
index 99674c2..d173bd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce14292d4f84448b3d87c3b475082d65  amanda-3.3.0beta1.tar.gz
+e206f42fb523c6bfe728b03665d4e277  amanda-3.3.0.tar.gz