From 0b98a798a5fa13010769ae87faf33082fd14005a Mon Sep 17 00:00:00 2001 From: Jan Görig Date: Jun 28 2010 14:45:20 +0000 Subject: rebase + various changes --- diff --git a/.cvsignore b/.cvsignore index 7f2f7fe..e2940ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.6.1p2.tar.gz +amanda-3.1.0.tar.gz diff --git a/amanda-3.1.0-example.patch b/amanda-3.1.0-example.patch new file mode 100644 index 0000000..7bee54a --- /dev/null +++ b/amanda-3.1.0-example.patch @@ -0,0 +1,18 @@ +diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am +--- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200 ++++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200 +@@ -4,10 +4,10 @@ include $(top_srcdir)/config/automake/va + include $(top_srcdir)/config/automake/installperms.am + + amanda_dir = $(amdatadir) +-templatedir = $(amanda_dir)/template.d +-server_exampledir = $(amanda_dir)/example +-client_exampledir = $(amanda_dir)/example +-lbltempldir = $(amanda_dir)/example/label-templates ++templatedir = $(localstatedir)/lib/amanda/template.d ++server_exampledir = $(sysconfdir)/amanda/example ++client_exampledir = $(sysconfdir)/amanda/example ++lbltempldir = $(sysconfdir)/amanda/example/label-templates + + template_in_FILE = \ + template.d/advanced.conf.in \ diff --git a/amanda-3.1.0-ftbfs.patch b/amanda-3.1.0-ftbfs.patch new file mode 100644 index 0000000..505e44b --- /dev/null +++ b/amanda-3.1.0-ftbfs.patch @@ -0,0 +1,12 @@ +diff -up amanda-3.1.0/common-src/glib-util.c.ftbfs amanda-3.1.0/common-src/glib-util.c +--- amanda-3.1.0/common-src/glib-util.c.ftbfs 2010-06-01 21:22:19.000000000 +0200 ++++ amanda-3.1.0/common-src/glib-util.c 2010-06-23 17:34:18.580848540 +0200 +@@ -42,7 +42,7 @@ glib_init(void) { + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED +- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ ++ /*g_assert(!g_thread_supported());*/ /* assert threads aren't initialized yet */ + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif diff --git a/amanda-xinetd b/amanda-xinetd index 4574e8c..0c6a256 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -10,7 +10,7 @@ service amanda wait = yes user = amandabackup group = disk - server = @LIBEXECDIR@/amanda/amandad + 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 # clients to use. diff --git a/amanda.spec b/amanda.spec index 0c6774a..ec624d6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,3 +1,4 @@ +%define _libexecdir %{_libdir} %{!?defconfig:%define defconfig DailySet1} %{!?indexserver:%define indexserver amandahost} %{!?tapeserver:%define tapeserver %{indexserver}} @@ -6,22 +7,20 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 2.6.1p2 -Release: 4%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz -#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz +#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd Source8: amandahosts Source9: README-rpm -Patch1: amanda-2.6.1p2-example.patch +Patch1: amanda-3.1.0-example.patch Patch2: amanda-2.6.1p2-xattrs.patch Patch3: amanda-2.6.0p2-tcpport.patch -Patch4: amanda-2.6.0b3-lib.patch -Patch5: amanda-2.6.1p2-pie.patch -Patch6: amanda-2.6.1p2-ftbfs.patch -License: BSD +Patch4: amanda-3.1.0-ftbfs.patch +License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,13 +28,15 @@ BuildRequires: automake autoconf libtool BuildRequires: dump gnuplot cups samba-client tar grep fileutils BuildRequires: gcc-c++ readline-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st -BuildRequires: perl-devel perl(ExtUtils::Embed) +BuildRequires: perl-devel perl(ExtUtils::Embed) perl(Test::Simple) BuildRequires: glib2-devel openssl-devel swig bison flex BuildRequires: libcurl-devel Requires(pre): shadow-utils Requires(post): grep sed Requires: fileutils grep initscripts tar /bin/mail xinetd Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Obsoletes: amanda-devel < 2.6.1p2-5 +Provides: amanda-devel = 2.6.1p2-5 %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a @@ -77,32 +78,22 @@ 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 -Summary: Libraries and documentation of the AMANDA tape backup system -Group: Development/Libraries -Requires(pre): amanda = %{version}-%{release} - -%description devel -The amanda-devel package should be installed on any machine that will -be used to develop amanda applications. - #%%define _default_patch_fuzz 3 %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .example -%patch2 -p1 -b .xattrs +#%patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport -%patch4 -p1 -b .lib -%patch5 -p1 -b .pie -%patch6 -p1 -b .ftbfs +%patch4 -p1 -b .ftbfs ./autogen %build export MAILER=/bin/mail -%configure --enable-shared \ - --disable-rpath \ +%configure CFLAGS=-fPIE LDFLAGS=-pie \ + --enable-shared \ + --disable-rpath \ --disable-static \ --disable-dependency-tracking \ --disable-installperms \ @@ -135,16 +126,18 @@ rm -rf ${RPM_BUILD_ROOT} make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d -perl -p -e "s,\@LIBEXECDIR\@,%{_libexecdir},g" < %SOURCE5 > $RPM_BUILD_ROOT/etc/xinetd.d/amanda +cp %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/amanda chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda mkdir -p $RPM_BUILD_ROOT/var/log/amanda 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 . #pushd tape-src/.libs -#install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir} +#install -m 755 amtapetype $RPM_BUILD_ROOT/%%{_sbindir} #popd pushd ${RPM_BUILD_ROOT} @@ -167,7 +160,7 @@ make check rm -rf ${RPM_BUILD_ROOT} %pre -# look for user 'amanda' with uid 33, if exists, rename to new %amanda_user +# look for user 'amanda' with uid 33, if exists, rename to new %%amanda_user getent passwd 'amanda' | grep ':33:' >/dev/null && usermod -l %amanda_user amanda >/dev/null 2>&1 && mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null @@ -187,7 +180,7 @@ mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null # when upgrading and .amandahosts contains obsolete user name, update it #[ $1 -eq 2 ] && #grep -E '^[^[:blank:]]+[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null && -# sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || : +# sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%%amanda_user\2/' /var/lib/amanda/.amandahosts || : %postun /sbin/ldconfig @@ -214,43 +207,99 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %files %defattr(-,root,root) +%doc COPYRIGHT* NEWS README README-rpm %config(noreplace) /etc/xinetd.d/amanda %attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so - %{_libdir}/libamdevice-*.so - %{_libdir}/libamglue.so -# %{_libdir}/libamtape-*.so - %{_libdir}/libamserver-*.so - %{_libdir}/librestore-*.so - %{_libdir}/libamclient-*.so - %{_libdir}/libamandad-*.so - %{_libdir}/libamar-*.so - %{_libdir}/libamxfer-*.so + %{_libdir}/libamanda.so + %{_libdir}/libamandad*.so + %{_libdir}/libamar*.so + %{_libdir}/libamglue*.so + %{_libdir}/libamxfer*.so + %{_libdir}/libndmjob*.so + %{_libdir}/libndmlib*.so %attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-glue -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob + +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver - %{_mandir}/man8/amrestore.8* - %{_mandir}/man8/amarchiver.8* - %{_mandir}/man8/script-email.8* +%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}/amcryptsimple +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/ + %{_mandir}/man5/amanda-archive-format.5* + %{_mandir}/man7/amanda-compatibility.7* + %{_mandir}/man5/amanda.conf* %{_mandir}/man7/amanda-auth.7* - %{_mandir}/man7/amanda-scripts.7* + %{_mandir}/man7/amanda-scripts.7* + %{_mandir}/man8/amanda.8* + %{_mandir}/man8/amarchiver.8* + %{_mandir}/man8/amplot.8* + %{_mandir}/man8/script-email.8* + %{_mandir}/man8/amaespipe.8* + %{_mandir}/man8/amcrypt-ossl-asym.8* + %{_mandir}/man8/amcrypt-ossl.8* + %{_mandir}/man8/amcryptsimple.8* + %{_mandir}/man8/amcrypt.8* + %{_mandir}/man8/amgpgcrypt.8* + %{_mandir}/man8/amgetconf.8* + %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/ %attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/ %attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig -%doc README-rpm -%{_mandir}/man5/amanda.conf* %files server %defattr(-,root,root) -%doc COPYRIGHT* NEWS README + %{_libdir}/libamdevice*.so + %{_libdir}/libamserver*.so +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll @@ -258,13 +307,12 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmlog %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/driver %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chio %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chs +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-manual %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mcutil %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mtx @@ -274,98 +322,99 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rth %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-scsi %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-zd-mtx -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp - -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport +%attr(4750,root,%amanda_group) %{_sbindir}/amcheck %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverify %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdd -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/ammt -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverifyrun -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/ -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index -%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* -%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* - -%{_mandir}/man8/amadmin.8* -%{_mandir}/man8/amaespipe.8* +%{_mandir}/man5/disklist.5* +%{_mandir}/man5/tapelist.5* +%{_mandir}/man7/amanda-devices.7* +%{_mandir}/man7/amanda-changers.7* +%{_mandir}/man7/amanda-taperscan.7* %{_mandir}/man8/amaddclient.8* -%{_mandir}/man8/amanda.8* -%{_mandir}/man8/amcheck.8* -%{_mandir}/man8/amcheckdb.8* -%{_mandir}/man8/amcheckdump.8* +%{_mandir}/man8/amadmin.8* %{_mandir}/man8/amcleanup.8* -%{_mandir}/man8/amcrypt.8* -%{_mandir}/man8/amcryptsimple.8* -#%%{_mandir}/man8/amdd.8* %{_mandir}/man8/amdevcheck.8* %{_mandir}/man8/amdump.8* +%{_mandir}/man8/amfetchdump.8* %{_mandir}/man8/amflush.8* -%{_mandir}/man8/amgetconf.8* -%{_mandir}/man8/amgpgcrypt.8* +%{_mandir}/man8/amcheckdb.8* +%{_mandir}/man8/amcheckdump.8* +%{_mandir}/man8/amcheck.8* %{_mandir}/man8/amlabel.8* -%{_mandir}/man8/amservice.8* -%{_mandir}/man8/amvault.8* -#%%{_mandir}/man8/ammt.8* %{_mandir}/man8/amoverview.8* -%{_mandir}/man8/amplot.8* %{_mandir}/man8/amreport.8* +%{_mandir}/man8/amrestore.8* %{_mandir}/man8/amrmtape.8* %{_mandir}/man8/amserverconfig.8* +%{_mandir}/man8/amservice.8* %{_mandir}/man8/amstatus.8* -%{_mandir}/man8/amtape.8* %{_mandir}/man8/amtapetype.8* +%{_mandir}/man8/amtape.8* %{_mandir}/man8/amtoc.8* -#%%{_mandir}/man8/amverify.8* -#%%{_mandir}/man8/amverifyrun.8* -%{_mandir}/man8/amcrypt-ossl.8* -%{_mandir}/man8/amcrypt-ossl-asym.8* -%{_mandir}/man7/amanda-changers.7* -%{_mandir}/man7/amanda-devices.7* -%{_mandir}/man5/disklist.5* -%{_mandir}/man5/tapelist.5* +%{_mandir}/man8/amvault.8* + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/ + +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/ +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index +%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* +%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf +%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* %files client %defattr(-,root,root) -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad + %{_libdir}/libamclient*.so %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/ %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp @@ -376,38 +425,42 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/selfcheck %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendbackup %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendsize -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/versionsuffix %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/teecount -%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* +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover + %{_mandir}/man7/amanda-applications.7* + %{_mandir}/man5/amanda-client.conf.5* %{_mandir}/man8/amgtar.8* + %{_mandir}/man8/ampgsql.8* + %{_mandir}/man8/amraw.8* + %{_mandir}/man8/amrecover.8* %{_mandir}/man8/amsamba.8* %{_mandir}/man8/amstar.8* + %{_mandir}/man8/amsuntar.8* %{_mandir}/man8/amzfs-sendrecv.8* %{_mandir}/man8/amzfs-snapshot.8* - %{_mandir}/man5/amanda-client.conf.5* - %{_mandir}/man7/amanda-applications.7* + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/ + %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates %attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/ %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf - -%files devel -%defattr(-,root,root) -%{_includedir}/amanda/ -%{_libdir}/libamanda.so -%{_libdir}/libamdevice.so -#%%{_libdir}/libamtape.so -%{_libdir}/libamclient.so -%{_libdir}/libamserver.so -%{_libdir}/librestore.so -%{_libdir}/libamandad.so -%{_libdir}/libamar.so -%{_libdir}/libamxfer.so +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* Mon Jun 28 2010 Jan Görig - 3.1.0-1 +- upgraded to new upstream version +- documentation moved to main package +- fixed license tag +- moved files from libexecdir to libdir to avoid multilib conflict +- moved files between subpackages +- updated path in xinetd config +- added -fPIE to CFLAGS and -pie to LDFLAGS +- removed unused patches +- removed obsolete devel subpackage + * Tue Jun 01 2010 Marcela Maslanova - 2.6.1p2-4 - Mass rebuild with perl-5.12.0 @@ -466,7 +519,7 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | - Update -pie patch - Fix Source typo - Move xinetd to main package - used by both client and server -- Move %{_libexecdir}/amanda/amanda-sh-lib.sh to main package +- Move %%{_libexecdir}/amanda/amanda-sh-lib.sh to main package - LIBEXECDIR is used in xinetd template - Make calcsize setuid root diff --git a/sources b/sources index 7bfe76a..7849c1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -816ef0101b6d968c5df7d7d7e793caed amanda-2.6.1p2.tar.gz +86f1e3e052d336849a60b46f876fc0e4 amanda-3.1.0.tar.gz