diff --git a/.cvsignore b/.cvsignore index b7d5d14..452ef77 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.4.3.tar.gz +amanda-2.4.4p1.tar.gz diff --git a/amanda-xinetd b/amanda-xinetd index 94abd0b..9f58bbd 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -10,6 +10,6 @@ service amanda wait = yes user = amanda group = disk - server = /usr/lib/amanda/amandad + server = @LIBDIR@/amandad disable = yes } diff --git a/amanda.spec b/amanda.spec index dfa4038..e01561d 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,12 +1,12 @@ -%define _libexecdir %{_prefix}/lib/amanda +%define _libexecdir %{_libdir}/amanda # XXX append lib to current _localstatedir setting %{expand: %%define _localstatedir %{_localstatedir}/lib} Summary: A network-capable tape backup solution. Name: amanda -Version: 2.4.3 -Release: 4 +Version: 2.4.4p1 +Release: 1 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source2: __README_QUICKSETUP__ @@ -18,26 +18,29 @@ Source7: amidxtape-xinetd Source8: amandahosts Patch0: amanda-2.4.2-bug18322.patch Patch1: amanda-2.4.3-sigchld.patch +Patch2: amanda-2.4.4p1-client-utils.patch +Patch3: amanda-2.4.4p1-pie.patch License: BSD Group: Applications/System URL: http://www.amanda.org Prereq: fileutils grep initscripts -BuildRequires: dump gnuplot LPRng samba-client tar grep fileutils -BuildRequires: libtool automake14 autoconf213 +BuildRequires: dump gnuplot cups samba-client tar grep fileutils +BuildRequires: libtool automake16 autoconf Requires: tar BuildRoot: %{_tmppath}/%{name}-%{version}-root %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a -backup system that allows the administrator of a LAN to set up a single -master backup server to back up multiple hosts to a single large capacity -tape drive. AMANDA uses native dump and/or GNU tar facilities and can -back up a large number of workstations running multiple versions of Unix. -Newer versions of AMANDA (including this version) can use SAMBA to back -up Microsoft(TM) Windows95/NT hosts. The amanda package contains the -core AMANDA programs and will need to be installed on both AMANDA clients -and AMANDA servers. Note that you will have to install the amanda-client -and amanda-server packages as well. +backup system that allows the administrator of a LAN to set up a +single master backup server to back up multiple hosts to one or more +tape drives or disk files. AMANDA uses native dump and/or GNU tar +facilities and can back up a large number of workstations running +multiple versions of Unix. Newer versions of AMANDA (including this +version) can use SAMBA to back up Microsoft(TM) Windows95/NT hosts. +The amanda package contains the core AMANDA programs and will need to +be installed on both AMANDA clients and AMANDA servers. Note that you +will have to install the amanda-client and/or amanda-server packages as +well. %package client Summary: The client component of the AMANDA tape backup system. @@ -48,8 +51,8 @@ Requires: amanda = %{version} %description client The Amanda-client package should be installed on any machine that will be backed up by AMANDA (including the server if it also needs to be -backed up). You will also need to install the amanda package to each -AMANDA client. +backed up). You will also need to install the amanda package on each +AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system. @@ -60,9 +63,9 @@ Requires: amanda = %{version} %description server The amanda-server package should be installed on the AMANDA server, -the machine attached to the device (such as a tape drive) where backups -will be written. You will also need to install the amanda package to -the AMANDA server. And, if the server is also to be backed up, the +the machine attached to the device(s) (such as a tape drive) where backups +will be written. You will also need to install the amanda package on +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. %package devel @@ -78,10 +81,12 @@ be used to develop amanda applications. %setup -q %patch0 -p1 -b .bug18322 %patch1 -p1 -b .sigchld +%patch2 -p1 -b .client-utils +%patch3 -p1 -b .pie libtoolize --copy --force -aclocal-1.4 -automake-1.4 -autoconf-2.13 +aclocal-1.6 +automake-1.6 +autoconf %build export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" @@ -94,6 +99,7 @@ export SED=sed --with-amandahosts \ --with-user=amanda \ --with-group=disk \ + --with-tmpdir=/var/log/amanda \ --with-gnutar=/bin/tar make %{?_smp_mflags} @@ -108,9 +114,13 @@ export SED=sed make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d -install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/amanda -install -m 644 %SOURCE6 $RPM_BUILD_ROOT/etc/xinetd.d/amandaidx -install -m 644 %SOURCE7 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape +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/var/lib/amanda install -m 660 %SOURCE8 $RPM_BUILD_ROOT/var/lib/amanda/.amandahosts @@ -121,7 +131,7 @@ rm -f examples/config.site cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir} pushd tape-src/.libs -install -m 755 tapetype $RPM_BUILD_ROOT/%{_sbindir} +install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir} popd cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/ @@ -183,6 +193,7 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %{_mandir}/man8/amrestore.8* %attr(660,amanda,disk) %config(noreplace) /var/lib/amanda/.amandahosts +%attr(02700,amanda,disk) %dir /var/log/amanda %attr(-,amanda,disk) %dir %{_localstatedir}/amanda/ %attr(-,amanda,disk) %dir %{_sysconfdir}/amanda/ %attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amandates @@ -204,13 +215,17 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %attr(4750,root,disk) %{_libexecdir}/planner %attr(-,amanda,disk) %{_libexecdir}/taper %attr(-,amanda,disk) %{_libexecdir}/amcleanupdisk -%attr(-,amanda,disk) %{_libexecdir}/chg-scsi +%attr(-,amanda,disk) %{_libexecdir}/chg-chio +%attr(-,amanda,disk) %{_libexecdir}/chg-chs +%attr(-,amanda,disk) %{_libexecdir}/chg-juke %attr(-,amanda,disk) %{_libexecdir}/chg-manual -%attr(-,amanda,disk) %{_libexecdir}/chg-multi +%attr(-,amanda,disk) %{_libexecdir}/chg-mcutil %attr(-,amanda,disk) %{_libexecdir}/chg-mtx +%attr(-,amanda,disk) %{_libexecdir}/chg-multi +%attr(-,amanda,disk) %{_libexecdir}/chg-null +%attr(-,amanda,disk) %{_libexecdir}/chg-rait %attr(-,amanda,disk) %{_libexecdir}/chg-rth -%attr(-,amanda,disk) %{_libexecdir}/chg-chs -%attr(-,amanda,disk) %{_libexecdir}/chg-chio +%attr(-,amanda,disk) %{_libexecdir}/chg-scsi %attr(-,amanda,disk) %{_libexecdir}/chg-zd-mtx %attr(-,amanda,disk) %{_libexecdir}/amcat.awk %attr(-,amanda,disk) %{_libexecdir}/amplot.awk @@ -233,7 +248,7 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %attr(-,amanda,disk) %{_sbindir}/amverify %attr(-,amanda,disk) %{_sbindir}/amstatus %attr(-,amanda,disk) %{_sbindir}/amplot -%attr(-,amanda,disk) %{_sbindir}/tapetype +%attr(-,amanda,disk) %{_sbindir}/amtapetype %attr(-,amanda,disk) %{_sbindir}/amdd %attr(-,amanda,disk) %{_sbindir}/ammt %attr(-,amanda,disk) %{_sbindir}/amverifyrun @@ -246,9 +261,8 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample %attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/DailySet1/disklist -%{_mandir}/man8/amplot.8* -%{_mandir}/man8/amanda.8* %{_mandir}/man8/amadmin.8* +%{_mandir}/man8/amanda.8* %{_mandir}/man8/amcheck.8* %{_mandir}/man8/amcheckdb.8* %{_mandir}/man8/amcleanup.8* @@ -259,18 +273,21 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %{_mandir}/man8/amlabel.8* %{_mandir}/man8/ammt.8* %{_mandir}/man8/amoverview.8* +%{_mandir}/man8/amplot.8* +%{_mandir}/man8/amreport.8* %{_mandir}/man8/amrmtape.8* +%{_mandir}/man8/amstatus.8* %{_mandir}/man8/amtape.8* +%{_mandir}/man8/amtapetype.8* %{_mandir}/man8/amtoc.8* %{_mandir}/man8/amverify.8* %{_mandir}/man8/amverifyrun.8* -%{_mandir}/man8/amstatus.8* -%{_mandir}/man8/amreport.8* %files client %defattr(-,root,root) %config /etc/xinetd.d/amanda %{_libdir}/libamclient*.so +%attr(-,amanda,disk) %dir %{_libexecdir}/ %attr(-,amanda,disk) %{_libexecdir}/amandad %attr(4750,root,disk) %{_libexecdir}/calcsize %attr(4750,root,disk) %{_libexecdir}/killpgrp @@ -295,6 +312,15 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ %{_libdir}/*.la %changelog +* Wed Jul 23 2003 Jay Fenlason 2.4.4p1-1 +- Merge from 2.4.4p1-0.3E + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Feb 26 2003 Jay Fenlason 2.4.4-0 +- New upstream version. + * Thu Feb 13 2003 Jay Fenlason 2.4.3-3 - Removed call to signal(SIGCHLD, SIG_IGN) which prevents wait...() from working on newer Red Hat systems. This fixes bug #84092. diff --git a/sources b/sources index 4d94819..d153396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -869c08b16838aeff2578991f23cf5182 amanda-2.4.3.tar.gz +6336cd53e81877a720a5104330731e75 amanda-2.4.4p1.tar.gz