From 795e2469c3d19e90005da180fd05d2f96fee4bd9 Mon Sep 17 00:00:00 2001
From: Radek Brich <rbrich@fedoraproject.org>
Date: Jul 12 2007 14:06:14 +0000
Subject: SELinux support


---

diff --git a/amanda-2.4.2-bug18322.patch b/amanda-2.4.2-bug18322.patch
deleted file mode 100644
index 74f0d54..0000000
--- a/amanda-2.4.2-bug18322.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
-+   AM_NORMAL_RE(": socket ignored"),
-+
- #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-2.5.0-pie.patch b/amanda-2.5.0-pie.patch
deleted file mode 100644
index 10255cb..0000000
--- a/amanda-2.5.0-pie.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff -u -r amanda-2.4.4p1.old/configure.in amanda-2.4.4p1/configure.in
---- amanda-2.4.4p1.old/configure.in	2003-06-27 10:19:53.000000000 -0400
-+++ amanda-2.4.4p1.pie/configure.in	2003-07-08 23:54:13.000000000 -0400
-@@ -2469,6 +2469,52 @@
- AC_REPLACE_FUNCS(strcasecmp)
- ICE_CHECK_DECL(strcasecmp,string.h strings.h)
- 
-+AC_MSG_CHECKING([for Position Independent Executable support])
-+save_CFLAGS="$CFLAGS"
-+save_LDFLAGS="$LDFLAGS"
-+CFLAGS="$CFLAGS -fpie"
-+LDFLAGS="$LDFLAGS -pie"
-+AC_TRY_RUN(
-+	[
-+int foo () __attribute__((visibility ("hidden")));
-+int foo () { return 0; }
-+int main () { return foo (); }
-+	],
-+	[
-+		ac_cv_pie_support=yes
-+	],
-+	[
-+		ac_cv_pie_support=no
-+	],
-+	[
-+		ac_cv_pie_support=no
-+	]
-+)
-+CFLAGS="$save_CFLAGS"
-+LDFLAGS="$save_LDFLAGS"
-+AC_MSG_RESULT($ac_cv_pie_support)
-+if test $ac_cv_pie_support = no; then
-+  AC_DEFINE(hidden,,
-+	    [Define as `__attribute__((visibility ("hidden")))' if the C compiler supports it,
-+	     or to nothing if it is not supported.])
-+  PIE_LDFLAGS=
-+  PIE_SED_CMD=
-+  COMPILE_PIE=
-+  EXIT0_IF_NO_PIE='exit 0'
-+else
-+  AC_DEFINE_UNQUOTED(hidden, __attribute__((visibility ("hidden"))))
-+  PIE_LDFLAGS="-pie -L.pie/ -Lopenbsd-compat/.pie/"
-+changequote(<<, >>)dnl
-+  PIE_SED_CMD='s_[ 	]\([^ 	]\)_ .pie/\1_g'
-+changequote([, ])dnl
-+  COMPILE_PIE=' && mkdir -p .pie && $(COMPILE) -c -fpie -o .pie/$@ \`test -f '"'"'$<'"'"' || echo '"'"'$(srcdir)/'"'"'\`$<'
-+  EXIT0_IF_NO_PIE=:
-+fi
-+AC_SUBST(PIE_LDFLAGS)
-+AC_SUBST(PIE_SED_CMD)
-+AC_SUBST(COMPILE_PIE)
-+AC_SUBST(EXIT0_IF_NO_PIE)
-+
- dnl disk device prefixes
- AC_MSG_CHECKING(disk device prefixes)
- dnl Use df to find the mount point for the root filesystem.  Use
---- amanda-2.4.4p1.orig/config/compile	1969-12-31 19:00:00.000000000 -0500
-+++ amanda-2.4.4p1.pie/config/compile	2003-07-16 16:57:18.000000000 -0400
-@@ -0,0 +1 @@
-+# Dummy compile for configure
---- amanda-2.5.0/server-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
-+++ amanda-2.5.0/server-src/Makefile.am	2006-04-07 15:27:09.000000000 -0400
-@@ -12,11 +12,48 @@
- 			amgetconf	amlabel		amtape		\
- 			amreport
- 
-+amadmin_CFLAGS = -fPIE $(AM_CFLAGS)
-+amadmin_LDFLAGS = -pie $(AM_LDFLAGS)
-+amcheck_CFLAGS = -fPIE $(AM_CFLAGS)
-+amcheck_LDFLAGS = -pie $(AM_LDFLAGS)
-+amflush_CFLAGS = -fPIE $(AM_CFLAGS)
-+amflush_LDFLAGS = -pie $(AM_LDFLAGS)
-+amgetconf_CFLAGS = -fPIE $(AM_CFLAGS)
-+amgetconf_LDFLAGS = -pie $(AM_LDFLAGS)
-+amlabel_CFLAGS = -fPIE $(AM_CFLAGS)
-+amlabel_LDFLAGS = -pie $(AM_LDFLAGS)
-+amreport_CFLAGS = -fPIE $(AM_CFLAGS)
-+amreport_LDFLAGS = -pie $(AM_LDFLAGS)
-+amtape_CFLAGS = -fPIE $(AM_CFLAGS)
-+amtape_LDFLAGS = -pie $(AM_LDFLAGS)
-+
- libexec_PROGRAMS =	amindexd	amlogroll	amtrmidx	\
- 			amtrmlog	driver		dumper		\
- 			planner		taper		amcleanupdisk	\
- 			chunker
- 
-+
-+taper_CFLAGS = -fPIE $(AM_CFLAGS)
-+taper_LDFLAGS = -pie $(AM_LDFLAGS)
-+driver_CFLAGS = -fPIE $(AM_CFLAGS)
-+driver_LDFLAGS = -pie $(AM_LDFLAGS)
-+chunker_CFLAGS = -fPIE $(AM_CFLAGS)
-+chunker_LDFLAGS = -pie $(AM_LDFLAGS)
-+amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS)
-+amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS)
-+amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS)
-+amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS)
-+amlogroll_CFLAGS = -fPIE $(AM_CFLAGS)
-+amlogroll_LDFLAGS = -pie $(AM_LDFLAGS)
-+amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS)
-+amcleanupdisk_LDFLAGS = -pie $(AM_LDFLAGS)
-+amindexd_CFLAGS = -fPIE $(AM_CFLAGS)
-+amindexd_LDFLAGS = -pie $(AM_LDFLAGS)
-+dumper_CFLAGS = -fPIE $(AM_CFLAGS)
-+dumper_LDFLAGS = -pie $(AM_LDFLAGS)
-+planner_CFLAGS = -fPIE $(AM_CFLAGS)
-+planner_LDFLAGS = -pie $(AM_LDFLAGS)
-+
- sbin_SCRIPTS =		amcheckdb	amcleanup	amdump		\
- 			amoverview	amrmtape	amtoc		\
- 			amverify	amverifyrun	amstatus	\
---- amanda-2.5.0/changer-src/Makefile.am.pie	2006-04-07 15:28:32.000000000 -0400
-+++ amanda-2.5.0/changer-src/Makefile.am	2006-04-07 15:30:09.000000000 -0400
-@@ -9,10 +9,14 @@
- 
- if WANT_CHIO_SCSI
- CHIO_SCSI = chg-scsi-chio
-+chg_scsi_chio_CFLAGS = -fPIE $(AM_CFLAGS)
-+chg_scsi_chio_LDFLAGS = -pie $(AM_LDFLAGS)
- endif
- 
- if WANT_CHG_SCSI
- CHG_SCSI = chg-scsi
-+chg_scsi_CFLAGS = -fPIE $(AM_CFLAGS)
-+chg_scsi_LDFLAGS = -pie $(AM_LDFLAGS)
- endif
- 
- libexec_PROGRAMS =	$(CHG_SCSI)
---- amanda-2.5.0/client-src/Makefile.am.pie	2006-02-14 06:51:20.000000000 -0500
-+++ amanda-2.5.0/client-src/Makefile.am	2006-04-07 15:33:17.000000000 -0400
-@@ -8,6 +8,27 @@
- 
- libexec_PROGRAMS =	amandad noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
- 
-+calcsize_CFLAGS = -fPIE $(AM_CFLAGS)
-+calcsize_LDFLAGS = -pie $(AM_LDFLAGS)
-+killpgrp_CFLAGS = -fPIE $(AM_CFLAGS)
-+killpgrp_LDFLAGS = -pie $(AM_LDFLAGS)
-+rundump_CFLAGS = -fPIE $(AM_CFLAGS)
-+rundump_LDFLAGS = -pie $(AM_LDFLAGS)
-+runtar_CFLAGS = -fPIE $(AM_CFLAGS)
-+runtar_LDFLAGS = -pie $(AM_LDFLAGS)
-+amandad_CFLAGS = -fPIE $(AM_CFLAGS)
-+amandad_LDFLAGS = -pie $(AM_LDFLAGS)
-+noop_CFLAGS = -fPIE $(AM_CFLAGS)
-+noop_LDFLAGS = -pie $(AM_LDFLAGS)
-+selfcheck_CFLAGS = -fPIE $(AM_CFLAGS)
-+selfcheck_LDFLAGS = -pie $(AM_LDFLAGS)
-+sendbackup_CFLAGS = -fPIE $(AM_CFLAGS)
-+sendbackup_LDFLAGS = -pie $(AM_LDFLAGS)
-+sendsize_CFLAGS = -fPIE $(AM_CFLAGS)
-+sendsize_LDFLAGS = -pie $(AM_LDFLAGS)
-+versionsuffix_CFLAGS = -fPIE $(AM_CFLAGS)
-+versionsuffix_LDFLAGS = -pie $(AM_LDFLAGS)
-+
- sbin_SCRIPTS =		@CLIENT_SCRIPTS_OPT@
- 
- libexec_SCRIPTS =	patch-system
---- amanda-2.5.0/restore-src/Makefile.am.pie	2006-02-14 06:51:23.000000000 -0500
-+++ amanda-2.5.0/restore-src/Makefile.am	2006-04-07 15:35:48.000000000 -0400
-@@ -32,6 +32,13 @@
-                    ../tape-src/libamtape.$(LIB_EXTENSION) \
-                   ../server-src/libamserver.$(LIB_EXTENSION)
- 
-+amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS)
-+amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS)
-+amrestore_CFLAGS = -fPIE $(AM_CFLAGS)
-+amrestore_LDFLAGS = -pie $(AM_LDFLAGS)
-+amfetchdump_CFLAGS = -fPIE $(AM_CFLAGS)
-+amfetchdump_LDFLAGS = -pie $(AM_LDFLAGS)
-+
- noinst_HEADERS = restore.h
- 
- install-exec-hook:
---- amanda-2.5.0/tape-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
-+++ amanda-2.5.0/tape-src/Makefile.am	2006-04-07 15:34:46.000000000 -0400
-@@ -8,6 +8,13 @@
- 
- sbin_PROGRAMS=          ammt amdd amtapetype
- 
-+amdd_CFLAGS = -fPIE $(AM_CFLAGS)
-+amdd_LDFLAGS = -pie $(AM_LDFLAGS)
-+ammt_CFLAGS = -fPIE $(AM_CFLAGS)
-+ammt_LDFLAGS = -pie $(AM_LDFLAGS)
-+amtapetype_CFLAGS = -fPIE $(AM_CFLAGS)
-+amtapetype_LDFLAGS = -pie $(AM_LDFLAGS)
-+
- libamtape_la_SOURCES = 	output-file.c \
- 			output-null.c \
- 			output-rait.c \
diff --git a/amanda-2.5.1p1-rsh.patch b/amanda-2.5.1p1-rsh.patch
deleted file mode 100644
index 73b19ea..0000000
--- a/amanda-2.5.1p1-rsh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- amanda-2.5.1p1/common-src/rsh-security.c.sav	2006-10-20 15:26:42.000000000 -0400
-+++ amanda-2.5.1p1/common-src/rsh-security.c	2006-10-20 15:27:00.000000000 -0400
-@@ -139,6 +139,7 @@
-     security_handleinit(&rh->sech, &rsh_security_driver);
-     rh->hostname = NULL;
-     rh->rs = NULL;
-+    rh->rc = NULL;
-     rh->ev_timeout = NULL;
- 
-     if ((he = gethostbyname(hostname)) == NULL) {
diff --git a/amanda-2.5.2p1-xattrs.patch b/amanda-2.5.2p1-xattrs.patch
new file mode 100644
index 0000000..1535aa2
--- /dev/null
+++ b/amanda-2.5.2p1-xattrs.patch
@@ -0,0 +1,58 @@
+--- 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);
diff --git a/amanda.conf b/amanda.conf
deleted file mode 100644
index fb0b7af..0000000
--- a/amanda.conf
+++ /dev/null
@@ -1,475 +0,0 @@
-#
-# amanda.conf - sample Amanda configuration file.  This started off life as
-#               the actual config file in use at CS.UMD.EDU.
-#
-# If your configuration is called, say, "csd", then this file normally goes
-# in /etc/amanda/csd/amanda.conf.
-#
-
-org "DailySet1"		# your organization name for reports
-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
-
-dumpcycle 4 weeks	# the number of days in the normal dump cycle
-runspercycle 4 weeks    # the number of amdump runs in dumpcycle days
-tapecycle 25 tapes	# the number of tapes in rotation
-			# 4 weeks (dumpcycle) times 5 tapes per week (just
-			# the weekdays) plus a few to handle errors that
-			# need amflush and so we do not overwrite the full
-			# backups performed at the beginning of the previous
-			# cycle
-### ### ###
-# WARNING: don't use `inf' for tapecycle, it's broken!
-### ### ###
-
-bumpsize 20 Mb		# minimum savings (threshold) to bump level 1 -> 2
-bumpdays 1		# minimum days at each level
-bumpmult 4		# threshold = bumpsize * bumpmult^(level-1)
-
-etimeout 300		# number of seconds per filesystem for estimates.
-#etimeout -600		# total number of seconds for estimates.
-# a positive number will be multiplied by the number of filesystems on
-# each host; a negative number will be taken as an absolute total time-out.
-# The default is 5 minutes per filesystem.
-			
-
-# Specify tape device and/or tape changer.  If you don't have a tape
-# changer, and you don't want to use more than one tape per run of
-# amdump, just comment out the definition of tpchanger.
-
-# Some tape changers require tapedev to be defined; others will use
-# their own tape device selection mechanism.  Some use a separate tape
-# changer device (changerdev), others will simply ignore this
-# parameter.  Some rely on a configuration file (changerfile) to
-# obtain more information about tape devices, number of slots, etc;
-# others just need to store some data in files, whose names will start
-# with changerfile.  For more information about individual tape
-# changers, read docs/TAPE.CHANGERS.
-
-# At most one changerfile entry must be defined; select the most
-# appropriate one for your configuration.  If you select man-changer,
-# keep the first one; if you decide not to use a tape changer, you may
-# comment them all out.
-
-runtapes 1		# number of tapes to be used in a single run of amdump
-#tpchanger "chg-manual"	# the tape-changer glue script
-#tapedev "/dev/null"	# the no-rewind tape device to be used
-#rawtapedev "/dev/null"	# the raw device to be used (ftape only)
-#changerfile "/var/lib/amanda/DailySet1/changer"
-#changerfile "/var/lib/amanda/DailySet1/changer-status"
-#changerfile "/etc/amanda/DailySet1/changer.conf"
-#changerdev "/dev/null"
-
-tapetype HP-DAT		# what kind of tape it is (see tapetypes below)
-labelstr "^DailySet1[0-9][0-9]*$"	# label constraint regex: all tapes must match
-
-# Specify holding disks.  These are used as a temporary staging area for
-# dumps before they are written to tape and are recommended for most sites.
-# The advantages include: tape drive is more likely to operate in streaming
-# mode (which reduces tape and drive wear, reduces total dump time); multiple
-# dumps can be done in parallel (which can dramatically reduce total dump time.
-# The main disadvantage is that dumps on the holding disk need to be flushed
-# (with amflush) to tape after an operating system crash or a tape failure.
-# If no holding disks are specified then all dumps will be written directly
-# to tape.  If a dump is too big to fit on the holding disk than it will be
-# written directly to tape.  If more than one holding disk is specified then
-# they will all be used round-robin.
-
-holdingdisk hd1 {
-    comment "main holding disk"
-    directory "/var/tmp"	# where the holding disk is
-    use 290 Mb		# how much space can we use on it
-			# a negative value mean:
-			#        use all space except that value
-#    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
-			# -N Kb/Mb/Gb dont split, dump larger
-			#             filesystems directly to tape
-			#             (example: -2 Gb)
-    }
-#holdingdisk hd2 {
-#    directory "/dumps2/amanda"
-#    use 1000 Mb
-#    }
-#holdingdisk hd3 {
-#    directory "/mnt/disk4"
-#    use 1000 Mb
-#    }
-
-
-# If amanda cannot find a tape on which to store backups, it will run
-# as many backups as it can to the holding disks.  In order to save
-# space for unattended backups, by default, amanda will only perform
-# incremental backups in this case, i.e., it will reserve 100% of the
-# holding disk space for the so-called degraded mode backups.
-# However, if you specify a different value for the `reserve'
-# parameter, amanda will not degrade backups if they will fit in the
-# non-reserved portion of the holding disk.
-
-# reserve 30 # percent
-
-
-# This means save at least 30% of the holding disk space for degraded
-# mode backups.  
-
-# Amanda needs a few Mb of diskspace for the log and debug files,
-# as well as a database.  This stuff can grow large, so the conf directory
-# isn't usually appropriate.  Some sites use /usr/local/var and some /usr/adm.
-# Create an amanda directory under there.  You need a separate infofile and
-# logdir for each configuration, so create subdirectories for each conf and
-# put the files there.  Specify the locations below.
-
-infofile "/var/lib/amanda/DailySet1/curinfo"	# database filename
-logdir   "/var/lib/amanda/DailySet1"		# log directory
-indexdir "/var/lib/amanda/DailySet1/index"	# index directory
-#tapelist "/var/lib/amanda/DailySet1/tapelist"	# list of used tapes
-# tapelist is stored, by default, in the directory that contains amanda.conf
-
-
-# tapetypes
-
-# Define the type of tape you use here, and use it in "tapetype"
-# above.  Some typical types of tapes are included here.  The tapetype
-# tells amanda how many MB will fit on the tape, how big the filemarks
-# are, and how fast the tape device is.
-
-# A filemark is the amount of wasted space every time a tape section
-# ends.  If you run `make tapetype' in tape-src, you'll get a program
-# that generates tapetype entries, but it is slow as hell, use it only
-# if you really must and, if you do, make sure you post the data to
-# the amanda mailing list, so that others can use what you found out
-# by searching the archives.
-
-# For completeness Amanda should calculate the inter-record gaps too,
-# but it doesn't.  For EXABYTE and DAT tapes this is ok.  Anyone using
-# 9 tracks for amanda and need IRG calculations?  Drop me a note if
-# so.
-
-# If you want amanda to print postscript paper tape labels
-# add a line after the comment in the tapetype of the form
-#    lbl-templ "/path/to/postscript/template/label.ps"
-
-# if you want the label to go to a printer other than the default
-# for your system, you can also add a line above for a different
-# printer. (i usually add that line after the dumpuser specification)
-
-# dumpuser "operator"     # the user to run dumps under
-# printer "mypostscript"  # printer to print paper label on
-
-# here is an example of my definition for an EXB-8500
-
-# define tapetype EXB-8500 {
-# ...
-#     lbl-templ "/usr/local/amanda/config/lbl.exabyte.ps"
-# }
-
-
-define tapetype QIC-60 {
-    comment "Archive Viper"
-    length 60 mbytes
-    filemark 100 kbytes		# don't know a better value
-    speed 100 kbytes		# dito
-}
-
-define tapetype DEC-DLT2000 {
-    comment "DEC Differential Digital Linear Tape 2000"
-    length 15000 mbytes
-    filemark 8 kbytes
-    speed 1250 kbytes
-}
-
-# goluboff@butch.Colorado.EDU
-# in amanda-users (Thu Dec 26 01:55:38 MEZ 1996)
-define tapetype DLT {
-    comment "DLT tape drives"
-    length 20000 mbytes		# 20 Gig tapes
-    filemark 2000 kbytes	# I don't know what this means
-    speed 1536 kbytes		# 1.5 Mb/s
-}
-
-define tapetype SURESTORE-1200E {
-    comment "HP AutoLoader"
-    length 3900 mbytes
-    filemark 100 kbytes
-    speed 500 kbytes
-}
-
-define tapetype EXB-8500 {
-    comment "Exabyte EXB-8500 drive on decent machine"
-    length 4200 mbytes
-    filemark 48 kbytes
-    speed 474 kbytes			
-}
-
-define tapetype EXB-8200 {
-    comment "Exabyte EXB-8200 drive on decent machine"
-    length 2200 mbytes
-    filemark 2130 kbytes
-    speed 240 kbytes			
-}
-
-define tapetype HP-DAT {
-    comment "DAT tape drives"
-    # data provided by Rob Browning <rlb@cs.utexas.edu>
-    length 1930 mbytes
-    filemark 111 kbytes
-    speed 468 kbytes
-}
-
-define tapetype DAT {
-    comment "DAT tape drives"
-    length 1000 mbytes		# these numbers are not accurate
-    filemark 100 kbytes		# but you get the idea
-    speed 100 kbytes
-}
-
-define tapetype MIMSY-MEGATAPE {
-    comment "Megatape (Exabyte based) drive through Emulex on Vax 8600"
-    length 2200 mbytes
-    filemark 2130 kbytes
-    speed 170 kbytes		# limited by the Emulex bus interface, ugh
-}
-
-
-# dumptypes
-#
-# These are referred to by the disklist file.  The dumptype specifies
-# certain parameters for dumping including:
-#   auth	- authentication scheme to use between server and client.
-#		  Valid values are "bsd" and "krb4".  Default: [auth bsd]
-#   comment	- just a comment string
-#   comprate	- set default compression rate.  Should be followed by one or
-#		  two numbers, optionally separated by a comma.  The 1st is
-#		  the full compression rate; the 2nd is the incremental rate.
-#		  If the second is omitted, it is assumed equal to the first.
-#		  The numbers represent the amount of the original file the
-#		  compressed file is expected to take up.
-#		  Default: [comprate 0.50, 0.50]
-#   compress	- specify compression of the backed up data.  Valid values are:
-#		  "none"        - don't compress the dump output.
-#		  "client best" - compress on the client using the best (and
-#				  probably slowest) algorithm.
-#		  "client fast" - compress on the client using fast algorithm.
-#		  "server best" - compress on the tape host using the best (and
-#				  probably slowest) algorithm.
-#		  "server fast" - compress on the tape host using a fast
-#				  algorithm.  This may be useful when a fast
-#				  tape host is backing up slow clients.
-#		  Default: [compress client fast]
-#   dumpcycle	- set the number of days in the dump cycle, ie, set how often a
-#		  full dump should be performed.  Default: from DUMPCYCLE above
-#   exclude	- specify files and directories to be excluded from the dump.
-#		  Useful with gnutar only; silently ignored by dump and samba.
-#		  Valid values are:
-#		  "pattern"       - a shell glob pattern defining which files
-#				    to exclude.
-#				    gnutar gets --exclude="pattern"
-#		  list "filename" - a file (on the client!) containing patterns
-#				    re's (1 per line) defining which files to
-#				    exclude.
-#				    gnutar gets --exclude-from="filename"
-#		  Note that the `full pathname' of a file within its
-#		  filesystem starts with `./', because of the way amanda runs
-#		  gnutar: `tar -C $mountpoint -cf - --lots-of-options .' (note
-#		  the final dot!)  Thus, if you're backing up `/usr' with a
-#		  diskfile entry like ``host /usr gnutar-root', but you don't
-#		  want to backup /usr/tmp, your exclude list should contain
-#		  the pattern `./tmp', as this is relative to the `/usr' above.
-#		  Please refer to the man-page of gnutar for more information.
-#		  Default: include all files
-#   holdingdisk	- should the holding disk be used for this dump.  Useful for
-#		  dumping the holding disk itself.  Default: [holdingdisk yes]
-#   ignore	- do not back this filesystem up.  Useful for sharing a single
-#		  disklist in several configurations.
-#   index	- keep an index of the files backed up.  Default: [index no]
-#   kencrypt	- encrypt the data stream between the client and server.
-#		  Default: [kencrypt no]
-#   maxdumps	- max number of concurrent dumps to run on the client.
-#		  Default: [maxdumps 1]
-#   priority	- priority level of the dump.  Valid levels are "low", "medium"
-#		  or "high".  These are really only used when Amanda has no
-#		  tape to write to because of some error.  In that "degraded
-#		  mode", as many incrementals as will fit on the holding disk
-#		  are done, higher priority first, to insure the important
-#		  disks are at least dumped.  Default: [priority medium]
-#   program	- specify the dump system to use.  Valid values are "DUMP" and
-#		  "GNUTAR".  Default: [program "DUMP"].
-#   record	- record the dump in /etc/dumpdates.  Default: [record yes]
-#   skip-full	- skip the disk when a level 0 is due, to allow full backups
-#		  outside Amanda, eg when the machine is in single-user mode.
-#   skip-incr	- skip the disk when the level 0 is NOT due.  This is used in
-#		  archive configurations, where only full dumps are done and
-#		  the tapes saved.
-#   starttime	- delay the start of the dump?  Default: no delay
-#   strategy	- set the dump strategy.  Valid strategies are currently:
-#		  "standard" - the standard one.
-#		  "nofull"   - do level 1 dumps every time.  This can be used,
-#			       for example, for small root filesystems that
-#			       only change slightly relative to a site-wide
-#			       prototype.  Amanda then backs up just the
-#			       changes.
-#		  "noinc"    - do level 0 dumps every time.
-#			       Unfortunately, this is not currently
-#			       implemented.  Use `dumpcycle 0'
-#			       instead.
-#		  "skip"     - skip all dumps.  Useful for sharing a single
-#			       disklist in several configurations.
-#		  Default: [strategy standard]
-#
-# Note that you may specify previously defined dumptypes as a shorthand way
-# of defining parameters.
-
-define dumptype global {
-    comment "Global definitions"
-    # This is quite useful for setting global parameters, so you don't have
-    # to type them everywhere.  All dumptype definitions in this sample file
-    # do include these definitions, either directly or indirectly.
-    # There's nothing special about the name `global'; if you create any
-    # dumptype that does not contain the word `global' or the name of any
-    # other dumptype that contains it, these definitions won't apply.
-    # Note that these definitions may be overridden in other
-    # dumptypes, if the redefinitions appear *after* the `global'
-    # dumptype name.
-    # You may want to use this for globally enabling or disabling
-    # indexing, recording, etc.  Some examples:
-    # index yes
-    # record no
-}
-
-define dumptype always-full {
-    global
-    comment "Full dump of this filesystem always"
-    compress none
-    priority high
-    dumpcycle 0
-}
-
-define dumptype root-tar {
-    global
-    program "GNUTAR"
-    comment "root partitions dumped with tar"
-    compress none
-    index
-    exclude list "/usr/local/lib/amanda/exclude.gtar"
-    priority low
-}
-
-define dumptype user-tar {
-    root-tar
-    comment "user partitions dumped with tar"
-    priority medium
-}
-
-define dumptype high-tar {
-    root-tar
-    comment "partitions dumped with tar"
-    priority high
-}
-
-define dumptype comp-root-tar {
-    root-tar
-    comment "Root partitions with compression"
-    compress client fast
-}
-
-define dumptype comp-user-tar {
-    user-tar
-    compress client fast
-}
-
-define dumptype holding-disk {
-    global
-    comment "The master-host holding disk itself"
-    holdingdisk no # do not use the holding disk
-    priority medium
-}
-
-define dumptype comp-user {
-    global
-    comment "Non-root partitions on reasonably fast machines"
-    compress client fast
-    priority medium
-}
-
-define dumptype nocomp-user {
-    comp-user
-    comment "Non-root partitions on slow machines"
-    compress none
-}
-
-define dumptype comp-root {
-    global
-    comment "Root partitions with compression"
-    compress client fast
-    priority low
-}
-
-define dumptype nocomp-root {
-    comp-root
-    comment "Root partitions without compression"
-    compress none
-}
-
-define dumptype comp-high {
-    global
-    comment "very important partitions on fast machines"
-    compress client best
-    priority high
-}
-
-define dumptype nocomp-high {
-    comp-high
-    comment "very important partitions on slow machines"
-    compress none
-}
-
-define dumptype nocomp-test {
-    global
-    comment "test dump without compression, no /etc/dumpdates recording"
-    compress none
-    record no
-    priority medium
-}
-
-define dumptype comp-test {
-    nocomp-test
-    comment "test dump with compression, no /etc/dumpdates recording"
-    compress client fast
-}
-
-# network interfaces
-#
-# These are referred to by the disklist file.  They define the attributes
-# of the network interface that the remote machine is accessed through.
-# Notes: - netusage above defines the attributes that are used when the
-#          disklist entry doesn't specify otherwise.
-#        - the values below are only samples.
-#        - specifying an interface does not force the traffic to pass
-#          through that interface.  Your OS routing tables do that.  This
-#          is just a mechanism to stop Amanda trashing your network.
-# Attributes are:
-#	use		- bandwidth above which amanda won't start
-#			  backups using this interface.  Note that if
-#			  a single backup will take more than that,
-#			  amanda won't try to make it run slower!
-
-define interface local {
-    comment "a local disk"
-    use 1000 kbps
-}
-
-define interface eth0 {
-    comment "10 Mbps ethernet"
-    use 400 kbps
-}
-
-# You may include other amanda configuration files, so you can share
-# dumptypes, tapetypes and interface definitions among several
-# configurations.
-
-#includefile "/usr/local/amanda.conf.main"
diff --git a/amanda.spec b/amanda.spec
index b9c7332..749ecd8 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -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 @@ Source8: amandahosts
 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 @@ be used to develop amanda applications.
 %patch1 -p1 -b .pie
 %patch3 -p1 -b .ylwrapNotFound
 %patch4 -p1 -b .undefSymbols
+%patch5 -p1 -b .xattrs
 ./autogen
 
 %build
@@ -336,6 +338,10 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Jul 12 2007 Radek Brich <rbrich@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@redhat.com> 2.5.2.p1-3
 - Update -undefSymbols patch. All undefined symbols reported by
   'ldd -r' should now be fixed (#198178).