rpms/amanda/devel amanda-2.6.1p2-example.patch, NONE, 1.1 amanda-2.6.1p2-xattrs.patch, NONE, 1.1 amanda.spec, 1.66, 1.67
Daniel Novotny
dnovotny at fedoraproject.org
Thu Jan 21 13:19:55 UTC 2010
Author: dnovotny
Update of /cvs/extras/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9920
Modified Files:
amanda.spec
Added Files:
amanda-2.6.1p2-example.patch amanda-2.6.1p2-xattrs.patch
Log Message:
rebase to 2.6.1p2
amanda-2.6.1p2-example.patch:
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE amanda-2.6.1p2-example.patch ---
diff -up amanda-2.6.1p2/example/Makefile.am.example amanda-2.6.1p2/example/Makefile.am
--- amanda-2.6.1p2/example/Makefile.am.example 2008-12-22 19:13:55.000000000 +0100
+++ amanda-2.6.1p2/example/Makefile.am 2010-01-20 13:47:02.000000000 +0100
@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va
include $(top_srcdir)/config/automake/installperms.am
amanda_dir = $(amdatadir)
-templatedir = $(amanda_dir)/template.d
-exampledir = $(amanda_dir)/example
-lbltempldir = $(amanda_dir)/example/label-templates
+templatedir = $(localstatedir)/lib/amanda/template.d
+exampledir = $(sysconfdir)/amanda/example
+lbltempldir = $(sysconfdir)/amanda/example/label-templates
EXTRA_DIST += chg-multi.conf \
chg-scsi.conf \
amanda-2.6.1p2-xattrs.patch:
application-src/amgtar_perl.pl | 4 ++--
client-src/sendbackup-gnutar.c | 3 ++-
client-src/sendsize.c | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
--- NEW FILE amanda-2.6.1p2-xattrs.patch ---
diff -up amanda-2.6.1p2/application-src/amgtar_perl.pl.xattrs amanda-2.6.1p2/application-src/amgtar_perl.pl
--- amanda-2.6.1p2/application-src/amgtar_perl.pl.xattrs 2010-01-20 16:25:16.000000000 +0100
+++ amanda-2.6.1p2/application-src/amgtar_perl.pl 2010-01-20 16:26:54.000000000 +0100
@@ -114,7 +114,7 @@ sub command_estimate {
}
}
my($size) = -1;
- my(@cmd) = ($self->{runtar}, $self->{'config'}, $self->{'gnutar'}, "--create", "--directory", $self->{'device'}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
+ my(@cmd) = ($self->{runtar}, $self->{'config'}, $self->{'gnutar'}, "--create", "--directory", $self->{'device'}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
debug("cmd:" . join(" ", @cmd));
my $wtrfh;
my $estimate_fd = Symbol::gensym;
@@ -180,7 +180,7 @@ sub command_backup {
if(defined($self->{index})) {
$verbose = "--verbose";
}
- my(@cmd) = ($self->{runtar}, $self->{config}, $self->{gnutar}, "--create", $verbose, "--directory", $self->{device}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
+ my(@cmd) = ($self->{runtar}, $self->{config}, $self->{gnutar}, "--create", $verbose, "--directory", $self->{device}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
debug("cmd:" . join(" ", @cmd));
diff -up amanda-2.6.1p2/client-src/sendbackup-gnutar.c.xattrs amanda-2.6.1p2/client-src/sendbackup-gnutar.c
--- amanda-2.6.1p2/client-src/sendbackup-gnutar.c.xattrs 2008-12-01 22:17:16.000000000 +0100
+++ amanda-2.6.1p2/client-src/sendbackup-gnutar.c 2010-01-20 16:23:17.000000000 +0100
@@ -520,7 +520,7 @@ start_backup(
if (nb_exclude > 0) file_exclude = build_exclude(dle, 0);
if (nb_include > 0) file_include = build_include(dle, 0);
- my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2)));
+ my_argv = alloc(SIZEOF(char *) * (23 + (nb_exclude*2)+(nb_include*2)));
cmd = vstralloc(amlibexecdir, "/", "runtar", versionsuffix(), NULL);
info_tapeheader(dle);
@@ -561,6 +561,7 @@ start_backup(
my_argv[i++] = "--atime-preserve";
#endif
my_argv[i++] = "--sparse";
+ my_argv[i++] = "--xattrs";
my_argv[i++] = "--ignore-failed-read";
my_argv[i++] = "--totals";
diff -up amanda-2.6.1p2/client-src/sendsize.c.xattrs amanda-2.6.1p2/client-src/sendsize.c
--- amanda-2.6.1p2/client-src/sendsize.c.xattrs 2009-11-05 20:57:09.000000000 +0100
+++ amanda-2.6.1p2/client-src/sendsize.c 2010-01-20 16:23:17.000000000 +0100
@@ -1931,7 +1931,7 @@ getsize_gnutar(
if(nb_exclude > 0) file_exclude = build_exclude(dle, 0);
if(nb_include > 0) file_include = build_include(dle, 0);
- my_argv = alloc(SIZEOF(char *) * 22);
+ my_argv = alloc(SIZEOF(char *) * 23);
i = 0;
gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR);
@@ -2070,6 +2070,7 @@ getsize_gnutar(
my_argv[i++] = "--atime-preserve";
#endif
my_argv[i++] = "--sparse";
+ my_argv[i++] = "--xattrs";
my_argv[i++] = "--ignore-failed-read";
my_argv[i++] = "--totals";
Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- amanda.spec 4 Dec 2009 01:58:58 -0000 1.66
+++ amanda.spec 21 Jan 2010 13:19:55 -0000 1.67
@@ -6,8 +6,8 @@
Summary: A network-capable tape backup solution
Name: amanda
-Version: 2.6.0p2
-Release: 15%{?dist}
+Version: 2.6.1p2
+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
Source1: amanda.crontab
@@ -15,13 +15,11 @@ Source4: disklist
Source5: amanda-xinetd
Source8: amandahosts
Source9: README-rpm
-Patch1: amanda-2.6.0b3-example.patch
-Patch2: amanda-2.6.0b2-xattrs.patch
+Patch1: amanda-2.6.1p2-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.0p2-pie.patch
-Patch6: amanda-2.6.0p2-builderr.patch
-Patch7: amanda-2.6.0p2-insec.patch
License: BSD
Group: Applications/System
URL: http://www.amanda.org
@@ -32,6 +30,7 @@ BuildRequires: gcc-c++ readline-devel
BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st
BuildRequires: perl-devel perl(ExtUtils::Embed)
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
@@ -86,15 +85,15 @@ Requires(pre): amanda = %{version}-%{rel
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
%patch3 -p1 -b .tcpport
%patch4 -p1 -b .lib
-%patch5 -p1 -b .pie
-%patch6 -p1 -b .builderr
-%patch7 -p1 -b .insec
+#%%patch5 -p1 -b .pie
./autogen
%build
@@ -142,9 +141,9 @@ install -m 600 %SOURCE8 $RPM_BUILD_ROOT%
cp %SOURCE9 .
-pushd tape-src/.libs
-install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
-popd
+#pushd tape-src/.libs
+#install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
+#popd
pushd ${RPM_BUILD_ROOT}
mv .%{_sysconfdir}/amanda/example .%{_sysconfdir}/amanda/%defconfig
@@ -217,17 +216,26 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so
%{_libdir}/libamdevice-*.so
%{_libdir}/libamglue.so
- %{_libdir}/libamtape-*.so
+# %{_libdir}/libamtape-*.so
%{_libdir}/libamserver-*.so
%{_libdir}/librestore-*.so
%{_libdir}/libamclient-*.so
%{_libdir}/libamandad-*.so
+ %{_libdir}/libamar-*.so
+ %{_libdir}/libamxfer-*.so
%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda
%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) %{_sbindir}/amarchiver
%{_mandir}/man8/amrestore.8*
+ %{_mandir}/man8/amarchiver.8*
+ %{_mandir}/man8/script-email.8*
+ %{_mandir}/man5/amanda-archive-format.5*
+ %{_mandir}/man7/amanda-auth.7*
+ %{_mandir}/man7/amanda-scripts.7*
%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
@@ -294,14 +302,17 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview
%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}/amverify
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype
-%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) %{_sbindir}/amservice
+%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
@@ -322,14 +333,16 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%{_mandir}/man8/amcleanup.8*
%{_mandir}/man8/amcrypt.8*
%{_mandir}/man8/amcryptsimple.8*
-%{_mandir}/man8/amdd.8*
+#%%{_mandir}/man8/amdd.8*
%{_mandir}/man8/amdevcheck.8*
%{_mandir}/man8/amdump.8*
%{_mandir}/man8/amflush.8*
%{_mandir}/man8/amgetconf.8*
%{_mandir}/man8/amgpgcrypt.8*
%{_mandir}/man8/amlabel.8*
-%{_mandir}/man8/ammt.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*
@@ -339,10 +352,14 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%{_mandir}/man8/amtape.8*
%{_mandir}/man8/amtapetype.8*
%{_mandir}/man8/amtoc.8*
-%{_mandir}/man8/amverify.8*
-%{_mandir}/man8/amverifyrun.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*
%files client
%defattr(-,root,root)
@@ -358,12 +375,19 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%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*
+ %{_mandir}/man8/amgtar.8*
+ %{_mandir}/man8/amsamba.8*
+ %{_mandir}/man8/amstar.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) %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
@@ -373,13 +397,18 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
%{_includedir}/amanda/
%{_libdir}/libamanda.so
%{_libdir}/libamdevice.so
-%{_libdir}/libamtape.so
+#%%{_libdir}/libamtape.so
%{_libdir}/libamclient.so
%{_libdir}/libamserver.so
%{_libdir}/librestore.so
%{_libdir}/libamandad.so
+%{_libdir}/libamar.so
+%{_libdir}/libamxfer.so
%changelog
+* Thu Jan 21 2010 Daniel Novotny <dnovotny at redhat.com> 2.6.1p2-1
+- upgrade to 2.6.1p2, drop upstreamed patches, rebase remaining patches
+
* Fri Dec 4 2009 Stepan Kasal <skasal at redhat.com> - 2.6.0p2-15
- rebuild against perl 5.10.1
More information about the scm-commits
mailing list