From 4a0a947f2bf44d1ad884676b2ce5a9b08b4f4cac Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 02:55:59 +0000 Subject: auto-import changelog data from amanda-2.4.2p2-1.src.rpm Thu Apr 04 2002 Trond Eivind Glomsr�d - 2.4.2p2 - fixes problems with amrecover (#26567) - made config files noreplace - don't build on IA64 right now, amanda doesn't like the dump there: It segfaults. Fri Mar 16 2001 Trond Eivind Glomsr�d - Add /usr/bin/smbclient to buildprereq (#31996), to avoid samba being built without such support Thu Feb 22 2001 Trond Eivind Glomsr�d - Use %{version} in source URL, and thus actually use 2.4.2p1 instead of 2.4.2 (doh! # 28759) - add patch to handle bogus /dev/root entries (#28759) Fri Feb 16 2001 Trond Eivind Glomsr�d - 2.4.2p1 bugfix release - move amandaixd and amidxtape to the server package (#28037) Wed Jan 31 2001 Trond Eivind Glomsr�d - move /etc/xinetd.d/amanda to the client subpackage (#25430) Tue Jan 30 2001 Trond Eivind Glomsr�d - don't have "chunksize -1" as the default, as it's no longer supported - make it uid amanda, with home /var/lib/amada so programs can actually access it (#20510) - make .amandahosts a config file (#18322) Tue Jan 23 2001 Trond Eivind Glomsr�d - 2.4.2 - make the UDP service "wait" (#23047) Tue Oct 10 2000 Jeff Johnson - build with shared libraries. - add amanda-devel package to contain static libraries. - update to 2.4.2-19991216-beta1 (#16818). - sort out client-server file confusions (#17232). - amandaidx-xinetd should have "wait = no" (#17551). - /var/lib/amanda needs operator.disk ownership (17913). - /etc/xinetd.d/amanda added to the amanda-server package (#18112). - ignore socket error message (#18322). Sun Sep 03 2000 Florian La Roche - do not include /etc/xinetd.d/amandaidx in the server rpm --- diff --git a/.cvsignore b/.cvsignore index 7ff47a2..c14e751 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.4.1p1.tar.gz +amanda-2.4.2p2.tar.gz diff --git a/amanda-2.4.2-bug18322.patch b/amanda-2.4.2-bug18322.patch new file mode 100644 index 0000000..9ce95de --- /dev/null +++ b/amanda-2.4.2-bug18322.patch @@ -0,0 +1,11 @@ +--- amanda-2.4.2-19991216-beta1/client-src/sendbackup-gnutar.c.bug18322 Thu Oct 12 15:15:21 2000 ++++ amanda-2.4.2-19991216-beta1/client-src/sendbackup-gnutar.c Thu Oct 12 15:16:50 2000 +@@ -99,6 +99,8 @@ + { DMP_NORMAL, "^load_client_codepage", 1}, + #endif + ++ { DMP_NORMAL, ": socket ignored", 1}, ++ + #ifdef IGNORE_SMBCLIENT_ERRORS + /* This will cause amanda to ignore real errors, but that may be + * unavoidable when you're backing up system disks. It seems to be diff --git a/amanda-xinetd b/amanda-xinetd index 8210665..94abd0b 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -7,8 +7,8 @@ service amanda { socket_type = dgram protocol = udp - wait = no - user = operator + wait = yes + user = amanda group = disk server = /usr/lib/amanda/amandad disable = yes diff --git a/amanda.conf b/amanda.conf index d1b5229..fb0b7af 100644 --- a/amanda.conf +++ b/amanda.conf @@ -7,8 +7,8 @@ # org "DailySet1" # your organization name for reports -mailto "operator" # space separated list of operators at your site -dumpuser "operator" # the user to run dumps under +mailto "amanda" # space separated list of operators at your site +dumpuser "amanda" # the user to run dumps under inparallel 4 # maximum dumpers that will run in parallel netusage 600 Kbps # maximum net bandwidth for Amanda, in KB per sec @@ -84,15 +84,13 @@ holdingdisk hd1 { use 290 Mb # how much space can we use on it # a negative value mean: # use all space except that value - chunksize -1 # size of chunk if you want big dump to be +# chunksize 2 Gb # size of chunk if you want big dump to be # dumped on multiple files on holding disks # N Kb/Mb/Gb split disks in chunks of size N # 0 split disks in INT_MAX/1024 Kb chunks - # -1 same as -INT_MAX/1024 (see below) # -N Kb/Mb/Gb dont split, dump larger # filesystems directly to tape # (example: -2 Gb) - # chunksize 2 Gb } #holdingdisk hd2 { # directory "/dumps2/amanda" diff --git a/amanda.spec b/amanda.spec index f5751c9..c5f9202 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,4 +1,3 @@ -%define __spec_install_post exit 0 %define _libexecdir %{_prefix}/lib/amanda # XXX append lib to current _localstatedir setting @@ -6,9 +5,9 @@ Summary: A network-capable tape backup solution. Name: amanda -Version: 2.4.1p1 -Release: 18 -Source: ftp://ftp.amanda.org/pub/amanda/amanda-2.4.1p1.tar.gz +Version: 2.4.2p2 +Release: 1 +Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source2: __README_QUICKSETUP__ Source3: amanda.conf @@ -16,14 +15,16 @@ Source4: disklist Source5: amanda-xinetd Source6: amandaidx-xinetd Source7: amidxtape-xinetd -Patch0: amanda-glibc21.patch -Patch1: amanda-glibc22.patch -Copyright: distributable +Source8: amandahosts +Patch0: amanda-2.4.2-bug18322.patch +License: BSD Group: Applications/System URL: http://www.amanda.org Prereq: fileutils grep initscripts -BuildRequires: gnuplot, dump -BuildRoot: %{_tmppath}/%{name}-root +BuildPreReq: dump gnuplot /usr/bin/lpr /usr/bin/smbclient +ExcludeArch: ia64 +Requires: tar +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a @@ -63,28 +64,26 @@ 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 server also needs to have the amanda-client package installed. +%package devel +Summary: Libraries and documentation of the AMANDA tape backup system. +Group: Development/Libraries +Requires: amanda = %{version} + +%description devel +The amanda-devel package should be installed on any machine that will +be used to develop amanda applications. + %prep -%setup -q -%patch0 -p1 -b .tim -%patch1 -p1 -b .tim1 +%setup -q +%patch0 -p1 -b .bug18322 %build -#fixes build issues on some newer arch's -#libtoolize --copy --force -#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_sbindir} \ -# --mandir=%{_mandir} --libexecdir=%{_libexecdir} \ -# --sysconfdir=%{_sysconfdir} \ -# --localstatedir=%{_localstatedir} --with-index-server=localhost \ -# --with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \ -# --with-smbclient=%{_bindir}/smbclient --with-amandahosts \ -# --with-user=operator --with-group=disk --with-gnutar=/bin/tar - -%configure \ +%configure --enable-shared \ --with-index-server=localhost \ --with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \ --with-smbclient=%{_bindir}/smbclient \ --with-amandahosts \ - --with-user=operator \ + --with-user=amanda \ --with-group=disk \ --with-gnutar=/bin/tar @@ -93,12 +92,6 @@ make %install rm -rf ${RPM_BUILD_ROOT} -#make \ -# prefix=${RPM_BUILD_ROOT}%{_prefix} \ -# mandir=${RPM_BUILD_ROOT}%{_mandir} \ -# bindir=${RPM_BUILD_ROOT}%{_sbindir} \ -# libexecdir=${RPM_BUILD_ROOT}%{_libexecdir} \ -# install %makeinstall BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) @@ -106,6 +99,8 @@ 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 +mkdir -p $RPM_BUILD_ROOT/var/lib/amanda +install -m 660 %SOURCE8 $RPM_BUILD_ROOT/var/lib/amanda/.amandahosts mkdir -p examples cp example/* examples @@ -126,33 +121,32 @@ cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/ mkdir -p .%{_localstatedir}/amanda/gnutar-lists mkdir -p .%{_localstatedir}/amanda/DailySet1/index +# for i in libamanda libamtape libamclient libamserver ; do +# mv .%{_libdir}/${i}.so .%{_libdir}/${i}-%{version}-19991216-beta1.so +# mv .%{_libdir}/${i}.la .%{_libdir}/${i}-%{version}-19991216-beta1.la +# mv .%{_libdir}/${i}.a .%{_libdir}/${i}-%{version}-19991216-beta1.a +# done + chmod 755 .%{_libdir}/libam* strip .%{_sbindir}/* || : - strip --strip-debug .%{_libexecdir}/* || : + strip .%{_libexecdir}/* || : } -#compress man pages -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress - %clean rm -rf ${RPM_BUILD_ROOT} +%pre +useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ + -c "Amanda user" -u 33 amanda >/dev/null 2>&1 || : + + + %post -p /sbin/ldconfig %post client /sbin/ldconfig [ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : -# make sure there is an .amandahosts file, allow localhost by default -if [ ! -f ~operator/.amandahosts ]; then - echo "localhost operator" > ~operator/.amandahosts - echo "localhost.localdomain operator" > ~operator/.amandahosts -fi -# make sure user operator has an .amandahosts file -touch ~operator/.amandahosts -chown operator.disk ~operator/.amandahosts -chmod 660 ~operator/.amandahosts - %post server /sbin/ldconfig [ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : @@ -169,96 +163,164 @@ chmod 660 ~operator/.amandahosts %files %defattr(-,root,root) -%doc examples docs/* -%config(noreplace) /etc/xinetd.d/amandaidx -%dir %{_sysconfdir}/amanda -%{_libdir}/libamanda* -%{_libdir}/libamtape* -%attr(-,operator,disk) %{_libexecdir}/amidxtaped -%attr(-,operator,disk) %{_sbindir}/amrestore +%{_libdir}/libamanda*.so +%{_libdir}/libamtape*.so +%attr(-,amanda,disk) %{_sbindir}/amrestore %{_mandir}/man8/amrestore.8* +%attr(660,amanda,disk) %config(noreplace) /var/lib/amanda/.amandahosts -%attr(-,operator,disk) %{_sysconfdir}/amandates +%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/ +%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda/ +%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amandates %files server %defattr(-,root,root) -%{_libdir}/libamserver* +%doc examples docs/[A-LN-Z]* docs/MULTITAPE COPYRIGHT* NEWS README +%{_libdir}/libamserver*.so %config(noreplace) /etc/xinetd.d/amandaidx %config(noreplace) /etc/xinetd.d/amidxtape -%attr(-,operator,disk) %{_libexecdir}/amindexd -%attr(-,operator,disk) %{_libexecdir}/amtrmidx -%attr(-,operator,disk) %{_libexecdir}/driver +%attr(-,amanda,disk) %{_libexecdir}/amidxtaped +%attr(-,amanda,disk) %{_libexecdir}/amindexd +%attr(-,amanda,disk) %{_libexecdir}/amlogroll +%attr(-,amanda,disk) %{_libexecdir}/amtrmidx +%attr(-,amanda,disk) %{_libexecdir}/amtrmlog +%attr(-,amanda,disk) %{_libexecdir}/driver %attr(4750,root,disk) %{_libexecdir}/dumper -%attr(-,operator,disk) %{_libexecdir}/getconf %attr(4750,root,disk) %{_libexecdir}/planner -%attr(-,operator,disk) %{_libexecdir}/taper - -%attr(-,operator,disk) %{_sbindir}/amadmin +%attr(-,amanda,disk) %{_libexecdir}/taper +%attr(-,amanda,disk) %{_libexecdir}/amcleanupdisk +%attr(-,amanda,disk) %{_libexecdir}/chg-scsi +%attr(-,amanda,disk) %{_libexecdir}/chg-manual +%attr(-,amanda,disk) %{_libexecdir}/chg-multi +%attr(-,amanda,disk) %{_libexecdir}/chg-mtx +%attr(-,amanda,disk) %{_libexecdir}/chg-rth +%attr(-,amanda,disk) %{_libexecdir}/chg-chs +%attr(-,amanda,disk) %{_libexecdir}/chg-chio +%attr(-,amanda,disk) %{_libexecdir}/chg-zd-mtx +%attr(-,amanda,disk) %{_libexecdir}/amcat.awk +%attr(-,amanda,disk) %{_libexecdir}/amplot.awk +%attr(-,amanda,disk) %{_libexecdir}/amplot.g +%attr(-,amanda,disk) %{_libexecdir}/amplot.gp + +%attr(-,amanda,disk) %{_sbindir}/amadmin %attr(4750,root,disk) %{_sbindir}/amcheck -%attr(-,operator,disk) %{_sbindir}/amcheckdb -%attr(-,operator,disk) %{_sbindir}/amcleanup -%attr(-,operator,disk) %{_sbindir}/amdump -%attr(-,operator,disk) %{_sbindir}/amflush -%attr(-,operator,disk) %{_sbindir}/amlabel -%attr(-,operator,disk) %{_sbindir}/amoverview -%attr(-,operator,disk) %{_sbindir}/amplot -%attr(-,operator,disk) %{_sbindir}/amreport -%attr(-,operator,disk) %{_sbindir}/amrmtape -%attr(-,operator,disk) %{_sbindir}/amstatus -%attr(-,operator,disk) %{_sbindir}/amtape -%attr(-,operator,disk) %{_sbindir}/amtoc -%attr(-,operator,disk) %{_sbindir}/amverify - -%attr(-,operator,disk) %{_libexecdir}/amcat.awk -%attr(-,operator,disk) %{_libexecdir}/amplot.awk -%attr(-,operator,disk) %{_libexecdir}/amplot.g -%attr(-,operator,disk) %{_libexecdir}/amplot.gp -%{_mandir}/man8/amadmin.8* -%{_mandir}/man8/amrmtape.8* -%{_mandir}/man8/amtape.8* -%{_mandir}/man8/amtoc.8* +%attr(-,amanda,disk) %{_sbindir}/amflush +%attr(-,amanda,disk) %{_sbindir}/amgetconf +%attr(-,amanda,disk) %{_sbindir}/amlabel +%attr(-,amanda,disk) %{_sbindir}/amtape +%attr(-,amanda,disk) %{_sbindir}/amreport +%attr(-,amanda,disk) %{_sbindir}/amcheckdb +%attr(-,amanda,disk) %{_sbindir}/amcleanup +%attr(-,amanda,disk) %{_sbindir}/amdump +%attr(-,amanda,disk) %{_sbindir}/amoverview +%attr(-,amanda,disk) %{_sbindir}/amrmtape +%attr(-,amanda,disk) %{_sbindir}/amtoc +%attr(-,amanda,disk) %{_sbindir}/amverify +%attr(-,amanda,disk) %{_sbindir}/amstatus +%attr(-,amanda,disk) %{_sbindir}/amplot + +%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/DailySet1/ +%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/DailySet1/index +%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda +%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda/DailySet1 +%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/DailySet1/amanda.conf +%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/amcheck.8* +%{_mandir}/man8/amcheckdb.8* %{_mandir}/man8/amcleanup.8* %{_mandir}/man8/amdump.8* %{_mandir}/man8/amflush.8* %{_mandir}/man8/amlabel.8* -%{_mandir}/man8/amplot.8* -%{_mandir}/man8/amreport.8* +%{_mandir}/man8/amoverview.8* +%{_mandir}/man8/amrmtape.8* +%{_mandir}/man8/amtape.8* +%{_mandir}/man8/amtoc.8* +%{_mandir}/man8/amverify.8* %{_mandir}/man8/amstatus.8* -%config %{_sysconfdir}/amanda/crontab.sample -%{_localstatedir}/amanda/gnutar-lists +%{_mandir}/man8/amreport.8* %files client %defattr(-,root,root) -%{_libdir}/libamclient* -%attr(-,operator,disk) %{_libexecdir}/amandad +%config /etc/xinetd.d/amanda +%{_libdir}/libamclient*.so +%attr(-,amanda,disk) %{_libexecdir}/amandad %attr(4750,root,disk) %{_libexecdir}/calcsize -%attr(-,operator,disk) %{_libexecdir}/chg-chio -%attr(-,operator,disk) %{_libexecdir}/chg-chs -%attr(-,operator,disk) %{_libexecdir}/chg-manual -%attr(-,operator,disk) %{_libexecdir}/chg-mtx -%attr(-,operator,disk) %{_libexecdir}/chg-multi -%attr(-,operator,disk) %{_libexecdir}/chg-rth -%attr(-,operator,disk) %{_libexecdir}/chg-zd-mtx %attr(4750,root,disk) %{_libexecdir}/killpgrp -%attr(-,operator,disk) %{_libexecdir}/patch-system +%attr(-,amanda,disk) %{_libexecdir}/patch-system %attr(4750,root,disk) %{_libexecdir}/rundump %attr(4750,root,disk) %{_libexecdir}/runtar -%attr(-,operator,disk) %{_libexecdir}/selfcheck -%attr(-,operator,disk) %{_libexecdir}/sendbackup -%attr(-,operator,disk) %{_libexecdir}/sendsize -%attr(-,operator,disk) %{_libexecdir}/versionsuffix -%attr(-,operator,disk) %{_sbindir}/amrecover -%attr(-,operator,disk) %{_sbindir}/security - -%{_mandir}/man8/amrecover.8* -%attr(-,operator,disk) %dir %{_sysconfdir}/amanda/DailySet1 -%attr(-,operator,disk) %{_sysconfdir}/amanda/DailySet1/amanda.conf -%attr(-,operator,disk) %{_sysconfdir}/amanda/DailySet1/disklist -%attr(-,operator,disk) %dir %{_localstatedir}/amanda/DailySet1/ +%attr(-,amanda,disk) %{_libexecdir}/selfcheck +%attr(-,amanda,disk) %{_libexecdir}/sendbackup +%attr(-,amanda,disk) %{_libexecdir}/sendsize +%attr(-,amanda,disk) %{_libexecdir}/versionsuffix +%attr(-,amanda,disk) %{_sbindir}/amrecover + %{_mandir}/man8/amrecover.8* +%attr(-,amanda,disk) %{_sbindir}/security +%attr(-,amanda,disk) %{_localstatedir}/amanda/gnutar-lists/ + +%files devel +%defattr(-,root,root) +%{_libdir}/libamanda.a +%{_libdir}/libamanda.la +%{_libdir}/libamtape.a +%{_libdir}/libamtape.la +%{_libdir}/libamclient.a +%{_libdir}/libamclient.la +%{_libdir}/libamserver.a +%{_libdir}/libamserver.la %changelog +* Wed Apr 4 2002 Trond Eivind Glomsr�d +- 2.4.2p2 - fixes problems with amrecover (#26567) +- made config files noreplace +- don't build on IA64 right now, amanda doesn't like + the dump there: It segfaults. + +* Fri Mar 16 2001 Trond Eivind Glomsr�d +- Add /usr/bin/smbclient to buildprereq (#31996), to + avoid samba being built without such support + +* Thu Feb 22 2001 Trond Eivind Glomsr�d +- Use %%{version} in source URL, and thus actually use + 2.4.2p1 instead of 2.4.2 (doh! # 28759) +- add patch to handle bogus /dev/root entries (#28759) + +* Fri Feb 16 2001 Trond Eivind Glomsr�d +- 2.4.2p1 bugfix release +- move amandaixd and amidxtape to the server package (#28037) + +* Wed Jan 31 2001 Trond Eivind Glomsr�d +- move /etc/xinetd.d/amanda to the client subpackage (#25430) + +* Tue Jan 30 2001 Trond Eivind Glomsr�d +- don't have "chunksize -1" as the default, as it's no longer + supported +- make it uid amanda, with home /var/lib/amada + so programs can actually access it (#20510) +- make .amandahosts a config file (#18322) + +* Tue Jan 23 2001 Trond Eivind Glomsr�d +- 2.4.2 +- make the UDP service "wait" (#23047) + +* Tue Oct 10 2000 Jeff Johnson +- build with shared libraries. +- add amanda-devel package to contain static libraries. +- update to 2.4.2-19991216-beta1 (#16818). +- sort out client-server file confusions (#17232). +- amandaidx-xinetd should have "wait = no" (#17551). +- /var/lib/amanda needs operator.disk ownership (17913). +- /etc/xinetd.d/amanda added to the amanda-server package (#18112). +- ignore socket error message (#18322). + +* Sun Sep 3 2000 Florian La Roche +- do not include /etc/xinetd.d/amandaidx in the server rpm + * Mon Aug 21 2000 Trond Eivind Glomsr�d - only do reload of xinetd if xinetd is running (#16653) - don't show output of reload command to STDOUT (#16653) diff --git a/amandahosts b/amandahosts new file mode 100644 index 0000000..a527714 --- /dev/null +++ b/amandahosts @@ -0,0 +1,2 @@ +localhost amanda +localhost.localdomain amanda diff --git a/sources b/sources index 363c48f..214ce8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13f34dc97c35f85f88e54ca25b2009ed amanda-2.4.1p1.tar.gz +f8f66a5a86df588f467db9997cce6764 amanda-2.4.2p2.tar.gz