[amanda] modified default client configuration and tcpport patch
Jan Görig
jgorig at fedoraproject.org
Tue Aug 10 13:37:14 UTC 2010
commit ea87af0592411764fd85b6b3ce837c97fa33fb45
Author: Jan Görig <jgorig at redhat.com>
Date: Tue Aug 10 15:34:22 2010 +0200
modified default client configuration and tcpport patch
README-rpm | 12 ------------
amanda-3.1.1-bsd.patch | 28 ++++++++++++++++++++++++++++
amanda.spec | 17 ++++++++++-------
3 files changed, 38 insertions(+), 19 deletions(-)
---
diff --git a/amanda-3.1.1-bsd.patch b/amanda-3.1.1-bsd.patch
new file mode 100644
index 0000000..dc65d94
--- /dev/null
+++ b/amanda-3.1.1-bsd.patch
@@ -0,0 +1,28 @@
+diff -up amanda-3.1.1/example/amanda-client.conf.in.bsd amanda-3.1.1/example/amanda-client.conf.in
+--- amanda-3.1.1/example/amanda-client.conf.in.bsd 2010-08-10 12:26:03.000000000 +0200
++++ amanda-3.1.1/example/amanda-client.conf.in 2010-08-10 14:37:54.027754862 +0200
+@@ -17,8 +17,8 @@ tapedev "@EXAMPLE_TAPEDEV@" # your
+ # auth - authentication scheme to use between server and client.
+ # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local",
+ # "rsh" and "ssh".
+-# Default: [auth "bsdtcp"]
+-auth "bsdtcp"
++# Default: [auth "bsd"]
++auth "bsd"
+
+ ssh_keys "" # your ssh keys file if you use ssh auth
+
+diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd amanda-3.1.1/example/amanda-client-postgresql.conf.in
+--- amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/amanda-client-postgresql.conf.in 2010-08-10 14:38:00.522754862 +0200
+@@ -16,8 +16,8 @@ tape_server "@DEFAULT_TAPE_SERVER@" # y
+ # auth - authentication scheme to use between server and client.
+ # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local",
+ # "rsh" and "ssh".
+-# Default: [auth "bsdtcp"]
+-auth "bsdtcp"
++# Default: [auth "bsd"]
++auth "bsd"
+
+ # your ssh keys file if you use ssh auth
+ ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover"
diff --git a/amanda.spec b/amanda.spec
index 2e1b886..de16732 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -8,17 +8,17 @@
Summary: A network-capable tape backup solution
Name: amanda
Version: 3.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
Source1: amanda.crontab
Source4: disklist
Source5: amanda-xinetd
Source8: amandahosts
-Source9: README-rpm
Patch1: amanda-3.1.0-example.patch
Patch2: amanda-3.1.1-xattrs.patch
-Patch3: amanda-2.6.0p2-tcpport.patch
+Patch3: amanda-3.1.1-tcpport.patch
Patch4: amanda-3.1.0-ftbfs.patch
+Patch5: amanda-3.1.1-bsd.patch
License: BSD and GPLv3+ and GPLv2+ and GPLv2
Group: Applications/System
URL: http://www.amanda.org
@@ -81,6 +81,7 @@ server also needs to have the amanda-client package installed.
%patch2 -p1 -b .xattrs
%patch3 -p1 -b .tcpport
%patch4 -p1 -b .ftbfs
+%patch5 -p1 -b .bsd
./autogen
%build
@@ -127,9 +128,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda
install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
-
-cp %SOURCE9 .
-
ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
pushd ${RPM_BUILD_ROOT}
@@ -174,7 +172,7 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
-%doc COPYRIGHT* NEWS README README-rpm
+%doc COPYRIGHT* NEWS README
%config(noreplace) /etc/xinetd.d/amanda
%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so
%{_libdir}/libamanda.so
@@ -418,6 +416,11 @@ rm -rf ${RPM_BUILD_ROOT}
%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
%changelog
+* Tue Aug 10 2010 Jan Görig <jgorig at redhat.com> - 3.1.1-2
+- removed obsolete README-rpm
+- modified client configuration to match xinetd one
+- modified tcpport patch to include postgresql sample configuration
+
* Tue Aug 03 2010 Jan Görig <jgorig at redhat.com> - 3.1.1-1
- upgraded to new upstream bugfix version
- dropped old upgrade scriptlets
More information about the scm-commits
mailing list