rpms/amanda/devel amanda-2.5.2p1-xattrs.patch, NONE, 1.1 amanda.spec, 1.39, 1.40 amanda-2.4.2-bug18322.patch, 1.2, NONE amanda-2.5.0-pie.patch, 1.1, NONE amanda-2.5.1p1-rsh.patch, 1.1, NONE amanda.conf, 1.2, NONE

[Radek Brich (rbrich)]

Author: rbrich

Update of /cvs/extras/rpms/amanda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19259

Modified Files:
	amanda.spec 
Added Files:
	amanda-2.5.2p1-xattrs.patch 
Removed Files:
	amanda-2.4.2-bug18322.patch amanda-2.5.0-pie.patch 
	amanda-2.5.1p1-rsh.patch amanda.conf 
Log Message:
SELinux support

amanda-2.5.2p1-xattrs.patch:

--- NEW FILE amanda-2.5.2p1-xattrs.patch ---
--- amanda-2.5.2p1/client-src/sendsize.c.xattrs	2007-05-15 20:14:58.000000000 +0200
+++ amanda-2.5.2p1/client-src/sendsize.c	2007-07-12 13:45:29.000000000 +0200
@@ -1863,7 +1863,7 @@ getsize_gnutar(
     if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0);
     if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0);
 
-    my_argv = alloc(SIZEOF(char *) * 22);
+    my_argv = alloc(SIZEOF(char *) * 23);
     i = 0;
 
     gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR);
@@ -2006,6 +2006,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";
 
--- amanda-2.5.2p1/client-src/sendbackup-gnutar.c.xattrs	2007-07-12 13:43:28.000000000 +0200
+++ amanda-2.5.2p1/client-src/sendbackup-gnutar.c	2007-07-12 13:45:35.000000000 +0200
@@ -532,7 +532,7 @@ start_backup(
 	if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0);
 	if(nb_include > 0) file_include = build_include(disk, amdevice, options, 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(libexecdir, "/", "runtar", versionsuffix(), NULL);
 	info_tapeheader();
@@ -568,6 +568,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";
 
--- amanda-2.5.2p1/dumper-src/amgtar.pl.in.xattrs	2007-05-04 13:38:51.000000000 +0200
+++ amanda-2.5.2p1/dumper-src/amgtar.pl.in	2007-07-12 12:33:42.000000000 +0200
@@ -150,7 +150,7 @@ sub command_estimate {
 sub command_estimate_opt_direct {
    my($config, $host, $disk, $device, $level, $listdir) = @_;
    my($size) = -1;
-   my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
+   my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
    #my(@cmd) = ($gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
    print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1);
    open3(\*WTRFH, '>&STDOUT', \*ESTIMATE, @cmd);
@@ -215,7 +215,7 @@ print DEBUG "level  =" . $level  . "\n" 
    if(defined($opt_index)) {
       $verbose = "--verbose";
    }
-   my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
+   my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
    #my(@cmd) = ($gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
 
    print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1);


Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- amanda.spec	25 Jun 2007 13:02:21 -0000	1.39
+++ amanda.spec	12 Jul 2007 14:06:14 -0000	1.40
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.5.2p1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -20,6 +20,7 @@
 Patch1: amanda-2.5.2p1-pie.patch
 Patch3: amanda-2.5.2p1-ylwrapNotFound.patch
 Patch4: amanda-2.5.2p1-undefSymbols.patch
+Patch5: amanda-2.5.2p1-xattrs.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -83,6 +84,7 @@
 %patch1 -p1 -b .pie
 %patch3 -p1 -b .ylwrapNotFound
 %patch4 -p1 -b .undefSymbols
+%patch5 -p1 -b .xattrs
 ./autogen
 
 %build
@@ -336,6 +338,10 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Jul 12 2007 Radek Brich <rbrich at redhat.com> 2.5.2.p1-4
+- Enable backing up ACL/SElinux xattrs with tar (#201916).
+- Removed obsolete patches and sources.
+
 * Mon Jun 25 2007 Radek Brich <rbrich at redhat.com> 2.5.2.p1-3
 - Update -undefSymbols patch. All undefined symbols reported by
   'ldd -r' should now be fixed (#198178).


--- amanda-2.4.2-bug18322.patch DELETED ---


--- amanda-2.5.0-pie.patch DELETED ---


--- amanda-2.5.1p1-rsh.patch DELETED ---


--- amanda.conf DELETED ---