diff --git a/.cvsignore b/.cvsignore index 5ad5bd7..56ee3e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.5.0p2-nosst.tar.gz +amanda-2.5.1p3.tar.gz diff --git a/amanda-xinetd b/amanda-xinetd index 9f58bbd..1f41cb5 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -10,6 +10,14 @@ service amanda wait = yes user = amanda group = disk - server = @LIBDIR@/amandad + server = @LIBDIR@/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 +# clients to use. +# +# 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 disable = yes } diff --git a/amanda.spec b/amanda.spec index bc30881..fa710df 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,33 +10,23 @@ Summary: A network-capable tape backup solution. Name: amanda -Version: 2.5.0p2 -Release: 4 -#Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz -# This is the upstream tarball with the problematic contrib/sst directory -# removed. -Source: amanda-%{version}-nosst.tar.gz +Version: 2.5.1p3 +Release: 1%{?dist} +Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd -Source6: amandaidx-xinetd -Source7: amidxtape-xinetd Source8: amandahosts Patch0: amanda-2.4.2-bug18322.patch Patch1: amanda-2.5.0-pie.patch -Patch2: amanda-2.5.0-amcheck_badtape.patch -Patch3: amanda-2.5.0p2-error_msg.patch -Patch4: amanda-2.5.0p2-restore.patch -Patch5: amanda-2.5.0p2-big_holding_disk.patch -Patch6: amanda-2.5.0p2-dump_size.patch -Patch7: amanda-2.5.0p2-new_gnutar.patch -Patch8: amanda-2.5.0p2-wildcards.patch +Patch2: amanda-2.5.1p1-rsh.patch License: BSD Group: Applications/System URL: http://www.amanda.org Prereq: fileutils grep initscripts BuildRequires: dump gnuplot cups samba-client tar grep fileutils BuildRequires: libtool automake autoconf gcc-c++ readline-devel /usr/bin/Mail +BuildRequires: krb5-devel rsh Requires: tar /usr/bin/Mail BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -69,7 +59,7 @@ AMANDA client machine. Summary: The server side of the AMANDA tape backup system. Group: Applications/System Requires: gnuplot -Prereq: fileutils grep /sbin/service xinetd +Prereq: fileutils grep /sbin/service Requires(pre): amanda = %{version} %description server @@ -92,18 +82,7 @@ be used to develop amanda applications. %setup -q %patch0 -p1 -b .bug18322 %patch1 -p1 -b .pie -%patch2 -p1 -b .amcheck_badtape -%patch3 -p1 -b .error_msg -%patch4 -p1 -b .restore -%patch5 -p1 -b .big_holding_disk -%patch6 -p1 -b .dump_size -%patch7 -p1 -b .new_gnutar -%patch8 -p1 -b .wildcards - -libtoolize --copy --force -aclocal -automake -autoconf +%patch2 -p1 -b .rsh %build export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" @@ -124,7 +103,10 @@ export SED=sed --with-tmpdir=/var/log/amanda \ --with-gnutar=/bin/tar \ --with-ssh-security \ - + --with-rsh-security \ + --with-bsdtcp-security \ + --with-bsdudp-security \ + --with-krb5-security make %{?_smp_mflags} (cd common-src; make security) @@ -140,10 +122,6 @@ make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_RO mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d perl -p -e "s,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE5 > $RPM_BUILD_ROOT/etc/xinetd.d/amanda chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda -perl -p -e "s,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE6 > $RPM_BUILD_ROOT/etc/xinetd.d/amandaidx -chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amandaidx -perl -p -e "s,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE7 > $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape -chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape mkdir -p $RPM_BUILD_ROOT/var/log/amanda mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts @@ -194,7 +172,6 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %post server /sbin/ldconfig -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : %postun -p /sbin/ldconfig @@ -204,7 +181,6 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %postun server /sbin/ldconfig -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : %files %defattr(-,root,root) @@ -213,6 +189,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_libdir}/libamserver-*.so %{_libdir}/librestore-*.so %{_libdir}/libamclient-*.so + %{_libdir}/libamandad-*.so %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore %{_mandir}/man8/amrestore.8* %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/amanda/.amandahosts @@ -227,8 +204,6 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %files server %defattr(-,root,root) %doc examples COPYRIGHT* NEWS README -%config(noreplace) /etc/xinetd.d/amandaidx -%config(noreplace) /etc/xinetd.d/amidxtape %attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amidxtaped %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amindexd @@ -264,10 +239,12 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.g %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.gp -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt +%attr(4750,root,%amanda_group) %{_sbindir}/amcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel @@ -318,6 +295,8 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_mandir}/man8/amtoc.8* %{_mandir}/man8/amverify.8* %{_mandir}/man8/amverifyrun.8* +%{_mandir}/man8/amcrypt-ossl.8* +%{_mandir}/man8/amcrypt-ossl-asym.8* %files client %defattr(-,root,root) @@ -337,7 +316,9 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump %{_mandir}/man8/amfetchdump.8* %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover %{_mandir}/man8/amrecover.8* + %{_mandir}/man5/amanda-client.conf.5* %attr(-,%amanda_user,%amanda_group) %{_localstatedir}/amanda/gnutar-lists/ %files devel @@ -347,8 +328,16 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_libdir}/libamclient.so %{_libdir}/libamserver.so %{_libdir}/librestore.so +%{_libdir}/libamandad.so %changelog +* Mon Feb 19 2007 Jay Fenlason 2.5.1p3-1%{?dist} +- Upgrade to new upstream release, now that 2.5.1 is somewhat stable. +- Note that this requires changing the xinetd configuration and amanda.conf + because of the new authentication mechanism. +- -server subpackage does not require xinetd. +- -server scriptlets do not need to reload xinetd. + * Mon Sep 25 2006 Jay Fenlason 2.5.0p2-4 - Include my -dump_size patch to close bz#206129: Dump output size determined incorrectly diff --git a/sources b/sources index 5275c93..ee366fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3da48d99f63ebc1814683fd1276b996 amanda-2.5.0p2-nosst.tar.gz +7232da6d43543f2c7dac2ded21c65ee9 amanda-2.5.1p3.tar.gz